From 1ddc5eaaaca1cbcbf58312d663b1010e8ab773c5 Mon Sep 17 00:00:00 2001 From: Ty Potter Date: Thu, 29 Aug 2024 09:14:36 -0600 Subject: [PATCH 1/5] parameterize SDK and test-data branches --- .github/workflows/unit-tests.yml | 34 +++++++++++++++++++++++++++++++- Makefile | 2 +- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 9b1d801..063ab6e 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -1,12 +1,44 @@ name: Swift -on: [push] +env: + SDK_BRANCH_NAME: ${{ inputs.sdk_branch || github.head_ref || github.ref_name }} + TEST_DATA_BRANCH_NAME: ${{ inputs.test_data_branch || 'main' }} + +on: + push: + + pull_request: + + workflow_dispatch: + + workflow_call: + inputs: + test_data_branch: + type: string + description: The branch in sdk-test-data to target for testcase files + required: false + default: main + sdk_branch: + type: string + description: The branch of the SDK to test + required: false jobs: build: runs-on: macos-latest steps: + - name: Display Testing Details + run: | + echo "Running SDK Test using" + echo "Test Data: sdk-test-data@${TEST_DATA_BRANCH_NAME}" + echo "SDK Branch: ios-sdk@${SDK_BRANCH_NAME}" + - uses: actions/checkout@v3 + with: + repository: Eppo-exp/ios-sdk + ref: ${{ env.SDK_BRANCH_NAME}} + + - name: 'Set up Cloud SDK' uses: 'google-github-actions/setup-gcloud@v1' diff --git a/Makefile b/Makefile index cdc292f..f7b597b 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ build: swift build .PHONY: test -test: +test: test-data swift test ## test-data From 1430298c51e8e3816d26d5659faa334abeae49d0 Mon Sep 17 00:00:00 2001 From: Ty Potter Date: Thu, 29 Aug 2024 09:17:52 -0600 Subject: [PATCH 2/5] use existing steps --- .github/workflows/unit-tests.yml | 9 +-------- Makefile | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 063ab6e..24e542b 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -38,18 +38,11 @@ jobs: repository: Eppo-exp/ios-sdk ref: ${{ env.SDK_BRANCH_NAME}} - - - name: 'Set up Cloud SDK' - uses: 'google-github-actions/setup-gcloud@v1' - - - name: 'Use gcloud CLI' - run: 'gcloud info' - - name: Build run: make build - name: Pull test data - run: make test-data + run: make test-data branchName=${{env.TEST_DATA_BRANCH_NAME}} - name: Run tests run: make test diff --git a/Makefile b/Makefile index f7b597b..3aeaa00 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ build: swift build .PHONY: test -test: test-data +test: swift test ## test-data From 498f40985de4f05e08ce05e5d169212acb80fab7 Mon Sep 17 00:00:00 2001 From: Ty Potter Date: Thu, 29 Aug 2024 09:24:47 -0600 Subject: [PATCH 3/5] use the full SDK name instead of alias --- .github/workflows/unit-tests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 24e542b..237a85c 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -31,11 +31,11 @@ jobs: run: | echo "Running SDK Test using" echo "Test Data: sdk-test-data@${TEST_DATA_BRANCH_NAME}" - echo "SDK Branch: ios-sdk@${SDK_BRANCH_NAME}" + echo "SDK Branch: eppo-ios-sdk@${SDK_BRANCH_NAME}" - uses: actions/checkout@v3 with: - repository: Eppo-exp/ios-sdk + repository: Eppo-exp/eppo-ios-sdk ref: ${{ env.SDK_BRANCH_NAME}} - name: Build @@ -46,3 +46,4 @@ jobs: - name: Run tests run: make test +x \ No newline at end of file From cc4ef98500ed501264a36727f4960e662ba2f1f8 Mon Sep 17 00:00:00 2001 From: Ty Potter Date: Thu, 29 Aug 2024 09:27:51 -0600 Subject: [PATCH 4/5] gah --- .github/workflows/unit-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 237a85c..04a4af8 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -46,4 +46,3 @@ jobs: - name: Run tests run: make test -x \ No newline at end of file From c30527e4ae793c06ab3e85cacd616edcae1f4d19 Mon Sep 17 00:00:00 2001 From: Ty Potter Date: Thu, 5 Sep 2024 11:32:22 -0600 Subject: [PATCH 5/5] limit on push to main --- .github/workflows/unit-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 04a4af8..642b21e 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -6,6 +6,7 @@ env: on: push: + branches: [main] pull_request: