From b780845c9190441ab0b6f749586e44fa72a770f3 Mon Sep 17 00:00:00 2001 From: Md Junaed Hossain <169046794+junaed-optimizely@users.noreply.github.com> Date: Fri, 20 Sep 2024 21:21:46 +0600 Subject: [PATCH 1/2] [FSSDK-10438] prioritize integration test before unit test run --- .github/workflows/react.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/react.yml b/.github/workflows/react.yml index d4c298e..269042b 100644 --- a/.github/workflows/react.yml +++ b/.github/workflows/react.yml @@ -7,6 +7,12 @@ on: branches: [ master ] jobs: + integration_tests: + name: Run integration tests + uses: optimizely/react-sdk/.github/workflows/integration_test.yml@master + secrets: + CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }} + TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }} unitTests: name: Run Unit Tests (Node ${{ matrix.node }}) runs-on: ubuntu-latest @@ -24,7 +30,6 @@ jobs: run: yarn install - name: Run tests run: yarn test - coverage: name: Jest Coverage Report runs-on: ubuntu-latest @@ -36,10 +41,4 @@ jobs: custom-title: 'Jest Coverage Report' package-manager: 'yarn' - integration_tests: - name: Run integration tests - needs: [ unitTests ] - uses: optimizely/react-sdk/.github/workflows/integration_test.yml@master - secrets: - CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }} - TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }} + From fc4b6dd6340ee7ed515896be34dbdd8dacf645d8 Mon Sep 17 00:00:00 2001 From: Md Junaed Hossain <169046794+junaed-optimizely@users.noreply.github.com> Date: Fri, 20 Sep 2024 21:39:23 +0600 Subject: [PATCH 2/2] [FSSDK-10438] revert the change to check branch protection rule --- .github/workflows/react.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/react.yml b/.github/workflows/react.yml index 269042b..89423f8 100644 --- a/.github/workflows/react.yml +++ b/.github/workflows/react.yml @@ -7,12 +7,6 @@ on: branches: [ master ] jobs: - integration_tests: - name: Run integration tests - uses: optimizely/react-sdk/.github/workflows/integration_test.yml@master - secrets: - CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }} - TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }} unitTests: name: Run Unit Tests (Node ${{ matrix.node }}) runs-on: ubuntu-latest @@ -30,6 +24,13 @@ jobs: run: yarn install - name: Run tests run: yarn test + integration_tests: + name: Run integration tests + needs: [ unitTests ] + uses: optimizely/react-sdk/.github/workflows/integration_test.yml@master + secrets: + CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }} + TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }} coverage: name: Jest Coverage Report runs-on: ubuntu-latest