Merge branch 'YOU54F-feat/content_type_matching'

pact-foundation · May 30, 2024 · ab4c7be · ab4c7be
2 parents 32b363b + 4f01a30
commit ab4c7be
Show file tree

Hide file tree

Showing 17 changed files with 386 additions and 179 deletions.
diff --git a/.github/workflows/build-ffi.yml b/.github/workflows/build-ffi.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ ubuntu-latest, windows-latest, macos-12 ]
+        operating-system: [ ubuntu-latest, windows-latest, macos-12, macos-14 ]
         rust: [ stable ]
     env:
       pact_do_not_track: true

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,8 +6,9 @@ jobs:
   build:
     runs-on: ${{ matrix.operating-system }}
     strategy:
+      fail-fast: false
       matrix:
-        operating-system: [ ubuntu-latest, windows-latest, macos-12 ]
+        operating-system: [ ubuntu-latest, windows-latest, macos-12, macos-14 ]
         rust: [ stable ]
     env:
       pact_do_not_track: true

diff --git a/.github/workflows/compatability-suite.yml b/.github/workflows/compatability-suite.yml
@@ -7,31 +7,47 @@ env:
 
 jobs:
   v1:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ ubuntu-latest, windows-latest, macos-12, macos-14 ]
     steps:
     - uses: actions/checkout@v2
     - uses: dtolnay/rust-toolchain@stable
     - name: Run Cucumber
       run: cargo test --test v1*
       working-directory: compatibility-suite
   v2:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ ubuntu-latest, windows-latest, macos-12, macos-14 ]
     steps:
       - uses: actions/checkout@v2
       - uses: dtolnay/rust-toolchain@stable
       - name: Run Cucumber
         run: cargo test --test v2*
         working-directory: compatibility-suite
   v3:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ ubuntu-latest, windows-latest, macos-12, macos-14 ]
     steps:
       - uses: actions/checkout@v2
       - uses: dtolnay/rust-toolchain@stable
       - name: Run Cucumber
         run: cargo test --test v3*
         working-directory: compatibility-suite
   v4:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ ubuntu-latest, windows-latest, macos-12, macos-14 ]
     steps:
       - uses: actions/checkout@v2
       - uses: dtolnay/rust-toolchain@stable

diff --git a/compatibility-suite/Cargo.lock b/compatibility-suite/Cargo.lock