Merge pull request #1124 from apple/release-6.0

Merge Release 6.0 into master

bindings/go/src/fdb/fdb.go

@@ -139,7 +139,7 @@ func APIVersion(version int) error {
 			if e == 2203 {
 				maxSupportedVersion := C.fdb_get_max_api_version()
 				if headerVersion > int(maxSupportedVersion) {
-					return fmt.Errorf("This version of the FoundationDB Go binding is not supported by the installed FoundationDB C library. The binding requires a library that supports API version %d, but the installed library supports a maximum version of %d.", version, maxSupportedVersion)
+					return fmt.Errorf("This version of the FoundationDB Go binding is not supported by the installed FoundationDB C library. The binding requires a library that supports API version %d, but the installed library supports a maximum version of %d.", headerVersion, maxSupportedVersion)
 				}
 				return fmt.Errorf("API version %d is not supported by the installed FoundationDB C library.", version)
 			}

build/docker-compose.yaml

@@ -13,25 +13,46 @@ services:
     volumes:
       - ..:/foundationdb
     working_dir: /foundationdb
+    environment:
+      - MAKEJOBS=1
+
+  release-setup: &release-setup
+    <<: *build-setup
+    environment:
+      - MAKEJOBS=1
+      - RELEASE=true
+
+  snapshot-setup: &snapshot-setup
+    <<: *build-setup
 
   build-docs:
     <<: *build-setup
-    command: make docpackage
+    command: bash -c 'make -j "$${MAKEJOBS}" docpackage'
 
-  build-release: &build-release
+
+  release-packages: &release-packages
+    <<: *release-setup
+    command: bash -c 'make -j "$${MAKEJOBS}" packages'
+
+  snapshot-packages: &snapshot-packages
     <<: *build-setup
-    environment:
-      - RELEASE=true
-    command: make packages
+    command: bash -c 'make -j "$${MAKEJOBS}" packages'
 
-  build-snapshot: &build-snapshot
+  prb-packages:
+    <<: *snapshot-packages
+
+
+  release-bindings: &release-bindings
+    <<: *release-setup
+    command: bash -c 'make -j "$${MAKEJOBS}" bindings'
+
+  snapshot-bindings: &snapshot-bindings
     <<: *build-setup
-    environment:
-      - RELEASE=false
-    command: make packages
+    command: bash -c 'make -j "$${MAKEJOBS}" bindings'
+
+  prb-bindings:
+    <<: *snapshot-bindings
 
-  build-prb:
-    <<: *build-snapshot
 
   shell:
     <<: *build-setup