From 65d34c9118925aeefcb231191bdf42a10b5f9741 Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Fri, 6 Jun 2025 11:16:48 -0400 Subject: [PATCH 1/5] chore: Specify branch for SSE contract test branch --- .github/workflows/common_ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/common_ci.yml b/.github/workflows/common_ci.yml index 3a9b409..a0cdc82 100644 --- a/.github/workflows/common_ci.yml +++ b/.github/workflows/common_ci.yml @@ -42,6 +42,7 @@ jobs: test_service_port: ${{ env.TEST_SERVICE_PORT }} token: ${{ secrets.GITHUB_TOKEN }} repo: sse-contract-tests + branch: main - name: Upload test service logs uses: actions/upload-artifact@v4 with: From 5f0b08846b12d94718373c72da73c632d6f2edcb Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Fri, 6 Jun 2025 11:18:03 -0400 Subject: [PATCH 2/5] Also remove continue on error --- .github/workflows/common_ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/common_ci.yml b/.github/workflows/common_ci.yml index a0cdc82..278c45d 100644 --- a/.github/workflows/common_ci.yml +++ b/.github/workflows/common_ci.yml @@ -37,7 +37,6 @@ jobs: - name: Start test service in background run: make start-contract-test-service-bg - uses: launchdarkly/gh-actions/actions/contract-tests@contract-tests-v1.0.2 - continue-on-error: true with: test_service_port: ${{ env.TEST_SERVICE_PORT }} token: ${{ secrets.GITHUB_TOKEN }} From b3009aa8cc35416dc67b1caf3f4d2d6786ce2e4f Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Fri, 6 Jun 2025 11:19:29 -0400 Subject: [PATCH 3/5] bump version --- .github/workflows/common_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/common_ci.yml b/.github/workflows/common_ci.yml index 278c45d..ccd2988 100644 --- a/.github/workflows/common_ci.yml +++ b/.github/workflows/common_ci.yml @@ -36,7 +36,7 @@ jobs: id: go-version - name: Start test service in background run: make start-contract-test-service-bg - - uses: launchdarkly/gh-actions/actions/contract-tests@contract-tests-v1.0.2 + - uses: launchdarkly/gh-actions/actions/contract-tests@contract-tests-v1.1.0 with: test_service_port: ${{ env.TEST_SERVICE_PORT }} token: ${{ secrets.GITHUB_TOKEN }} From ca845687b7448b29de3df9fb10e71c3079e81ae2 Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Fri, 6 Jun 2025 11:24:35 -0400 Subject: [PATCH 4/5] Fix make commands --- Makefile | 4 ++-- contract-tests/go.sum | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5e40203..c52ae2b 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ bump-min-go-version: build-contract-tests: @cd contract-tests && go mod tidy && go build -start-contract-test-service: +start-contract-test-service: build-contract-tests @./contract-tests/contract-tests start-contract-test-service-bg: @@ -37,7 +37,7 @@ start-contract-test-service-bg: @make start-contract-test-service >$(TEMP_TEST_OUTPUT) 2>&1 & run-contract-tests: - @curl -s https://raw.githubusercontent.com/launchdarkly/sse-contract-tests/v2.0.0/downloader/run.sh \ + @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" sh contract-tests: build-contract-tests start-contract-test-service-bg run-contract-tests diff --git a/contract-tests/go.sum b/contract-tests/go.sum index 3b45387..d26315c 100644 --- a/contract-tests/go.sum +++ b/contract-tests/go.sum @@ -12,5 +12,6 @@ github.com/stretchr/testify v1.6.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA= +gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From b041b81da9730088663f0c94fc3a6fbae20a10f2 Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Fri, 6 Jun 2025 11:27:30 -0400 Subject: [PATCH 5/5] Build first --- .github/workflows/common_ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/common_ci.yml b/.github/workflows/common_ci.yml index ccd2988..e775b37 100644 --- a/.github/workflows/common_ci.yml +++ b/.github/workflows/common_ci.yml @@ -34,6 +34,8 @@ jobs: go-version: ${{ inputs.go-version }} - uses: ./.github/actions/get-go-version id: go-version + - name: Build test service + run: make build-contract-tests - name: Start test service in background run: make start-contract-test-service-bg - uses: launchdarkly/gh-actions/actions/contract-tests@contract-tests-v1.1.0