tweaks

launchdarkly · Aug 13, 2024 · d687474 · d687474
1 parent 290a8e5
commit d687474
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 20 deletions.
diff --git a/.github/actions/ci/action.yml b/.github/actions/ci/action.yml
@@ -71,16 +71,6 @@ runs:
       shell: bash
       run: swift test -v 2>&1 | xcpretty
 
-    - name: Build contract test service
+    - name: Run contract tests
       shell: bash
-      run: make build-contract-tests
-
-    - name: Start contract test service
-      shell: bash
-      run: make start-contract-test-service-bg
-
-    - uses: launchdarkly/gh-actions/actions/contract-tests@contract-tests-v1.0.2
-      with:
-        token: ${{ inputs.token }}
-        test_service_port: '8000'
-        extra_params: "-status-timeout 60 -stop-service-at-end -skip 'basic parsing/large message in one chunk' -skip 'basic parsing/large message in two chunks'"
+      run: make contract-tests
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,6 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     strategy:
+      fail-fast: false
       matrix:
         include:
           - xcode-version: 15.0.1
@@ -43,22 +44,17 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: false
       matrix:
         swift-version:
-          - 5.1
-          - 5.2
-          - 5.3
-          - 5.4
-          - 5.5
-          - 5.6
           - 5.7
           - 5.8
           - 5.9
 
     container: swift:${{ matrix.swift-version }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # If you only need the current version keep this.
 

diff --git a/Makefile b/Makefile
@@ -21,7 +21,7 @@ start-contract-test-service-bg:
 
 run-contract-tests:
 	curl -s https://raw.githubusercontent.com/launchdarkly/sse-contract-tests/main/downloader/run.sh \
-		| VERSION=v2 PARAMS="-url http://localhost:8000 -debug -stop-service-at-end -skip 'basic parsing/large message in one chunk' -skip 'basic parsing/large message in two chunks'" sh
+		| VERSION=v1 PARAMS="-url http://localhost:8000 -debug -stop-service-at-end -skip 'basic parsing/large message in one chunk' -skip 'basic parsing/large message in two chunks'" sh
 
 contract-tests: build-contract-tests start-contract-test-service-bg run-contract-tests