Pipe through env vars to control fed version

apollographql · Jul 4, 2024 · ebbae3b · ebbae3b
1 parent 40be0b8
commit ebbae3b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/.github/workflows/test-tests.yml b/.github/workflows/test-tests.yml
@@ -7,6 +7,5 @@ jobs:
   tests-mac-x86:
     uses: ./.github/workflows/tests-mac-x86.yml
     with:
-      router-versions: '["1.48.0", "1.49.0"]'
-      composition-versions: '["2.8.0"]'
+      composition-versions: '["2.8.0", "2.8.1", "2.8.2"]'
     secrets: inherit
diff --git a/.github/workflows/tests-mac-x86.yml b/.github/workflows/tests-mac-x86.yml
@@ -1,10 +1,6 @@
 on:
   workflow_dispatch:
     inputs:
-      router-versions:
-        description: 'JSON list of router versions'
-        required: true
-        type: string
       composition-versions:
         description: 'JSON list of supergraph versions'
         required: true
@@ -13,10 +9,6 @@ on:
   # just for testing
   workflow_call:
     inputs:
-      router-versions:
-        description: 'JSON list of router versions'
-        required: true
-        type: string
       composition-versions:
         description: 'JSON list of supergraph versions'
         required: true
@@ -60,20 +52,22 @@ jobs:
     name: Run integration tests on macOS x86-64
     strategy:
       matrix:
-        router-version: ${{ fromJSON(inputs.router-versions) }}
         composition-version: ${{ fromJSON(inputs.composition-versions) }}
     # x86-64 runner
     runs-on: macos-13
     env:
-      APOLLO_ROVER_DEV_ROUTER_VERSION: ${{ matrix.router-version }}
-      APOLLO_ROVER_DEV_COMPOSITION_VERSION: ${{ matrix.composition-version }}
+      TEST_COMPOSITION_VERSION: "=${{ matrix.composition-version }}"
       ROVER_BINARY: ../../artifact/rover
       FLYBY_APOLLO_KEY: ${{ secrets.FLYBY_APOLLO_KEY }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
       - uses: volta-cli/action@v4
+      - uses: mikefarah/yq@v4.44.2
+      - name: Add explicit version to `supergraph.yaml` files
+        run: |
+          for f in examples/flyby/supergraphs/*.yaml; do yq -i '.federation_version = strenv(TEST_COMPOSITION_VERSION)' $f; cat $f; done
       - name: Run Integration tests
         run: |
           chmod +x ./artifact/{rover,xtask}
-          ./artifact/xtask integration-test --binary_path ./artifact/rover
+          ./artifact/xtask integration-test