Merge branch 'main' into igni/send_id_on_error

.circleci/config.yml

@@ -62,7 +62,7 @@ workflows:
           matrix:
             parameters:
               platform: [amd_macos]
-          requires: 
+          requires:
             - "Run cargo tests (stable rust on amd_macos)"
 
   release:
@@ -95,10 +95,10 @@ workflows:
           matrix:
             parameters:
               platform: [amd_macos]
-          requires: 
+          requires:
             - "Run cargo tests (stable rust on amd_macos)"
           <<: *any_release
-          
+
       - publish_release:
           name: Publish to crates.io and create a GitHub release
           matrix:
@@ -195,7 +195,7 @@ jobs:
           platform: << parameters.platform >>
           command: publish
       - gh_release
-      
+
   check_for_github_action:
     parameters:
       platform:
@@ -296,13 +296,6 @@ commands:
             - run:
                 name: Skip homebrew update
                 command: echo "HOMEBREW_NO_AUTO_UPDATE=1" >> $BASH_ENV
-            - run:
-                name: Install curl
-                # we need to override the system curl because of outdated CA certificates
-                # on the base macos image
-                command: |
-                  brew install curl
-                  echo 'export PATH="/usr/local/opt/curl/bin:$PATH"' >> $BASH_ENV
             - run:
                 name: Install CMake
                 command: |

.github/workflows/release.yml

@@ -33,7 +33,10 @@ jobs:
         #   run: curl https://sh.rustup.rs -sSf | sh -s -- -y
 
       - name: Run cargo xtask
-        run: cargo xtask dist --debug
+        run: cargo xtask dist
+
+      - name: Run cargo build
+        run: cargo build -p harmonizer
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v5

harmonizer/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "harmonizer"
-version = "2.8.3"
+version = "2.8.4"
 authors = ["Apollo <[email protected]>"]
 edition = "2018"
 description = "Apollo Federation utility to compose a supergraph from subgraphs"

harmonizer/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@apollo/harmonizer-2",
   "private": true,
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "Apollo Federation Harmonizer JS Entrypoint",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,7 +29,7 @@
     "npm": ">=7 <11"
   },
   "dependencies": {
-    "@apollo/composition": "2.8.3"
+    "@apollo/composition": "2.8.4"
   },
   "peerDependencies": {
     "graphql": "^15.7.0 || ^16.0.0"

supergraph/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "supergraph"
-version = "2.8.3"
+version = "2.8.4"
 edition = "2021"
 publish = false