Skip to content

Commit

Permalink
Revert "Change env IS_TESTABLE_TEMPLATE to more clear IS_TEMPLATE_FRO…
Browse files Browse the repository at this point in the history
…M_RETAIL_REACT_APP"

This reverts commit bddcecc.
  • Loading branch information
wjhsf committed Jan 18, 2023
1 parent 3bd96c0 commit 09058b6
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ jobs:
template: [test-project, retail-react-app-demo, express-minimal-test-project, typescript-minimal-test-project]
runs-on: ubuntu-latest
env:
IS_TEMPLATE_FROM_RETAIL_REACT_APP: ${{ matrix.template == 'test-project' || matrix.template == 'retail-react-app-demo' }}
IS_TESTABLE_TEMPLATE: ${{ matrix.template == 'test-project' || matrix.template == 'retail-react-app-demo' }}
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -153,20 +153,20 @@ jobs:
timeout-minutes: 5

- name: Run tests
if: env.IS_TEMPLATE_FROM_RETAIL_REACT_APP
if: env.IS_TESTABLE_TEMPLATE
uses: "./.github/actions/unit_tests"
with:
cwd: generated-${{ matrix.template }}

- name: Smoke test scripts
if: env.IS_TEMPLATE_FROM_RETAIL_REACT_APP
if: env.IS_TESTABLE_TEMPLATE
uses: "./.github/actions/smoke_tests"
with:
dir: generated-${{ matrix.template }}

- name: Count Generated Project Dependencies
id: count_deps
if: env.IS_TEMPLATE_FROM_RETAIL_REACT_APP
if: env.IS_TESTABLE_TEMPLATE
uses: "./.github/actions/count_deps"

- name: Store Verdaccio logfile artifact
Expand All @@ -175,36 +175,36 @@ jobs:
path: packages/pwa-kit-create-app/local-npm-repo/verdaccio.log

- name: Audit Generated Project
if: env.IS_NOT_FORK && env.IS_TEMPLATE_FROM_RETAIL_REACT_APP
if: env.IS_NOT_FORK && env.IS_TESTABLE_TEMPLATE
uses: "./.github/actions/snyk"
with:
snyk_token: ${{ secrets.SNYK_TOKEN }}

- name: Send metrics to Datadog
if: env.IS_NOT_FORK && env.IS_TEMPLATE_FROM_RETAIL_REACT_APP
if: env.IS_NOT_FORK && env.IS_TESTABLE_TEMPLATE
uses: "./.github/actions/datadog"
with:
datadog_api_key: ${{ secrets.DATADOG_API_KEY }}
# TODO: The way this is set is a little bit magic - can it be cleaned up?
TOTAL_PACKAGES: $TOTAL_PACKAGES

- name: Create MRT credentials file
if: env.IS_NOT_FORK && env.IS_TEMPLATE_FROM_RETAIL_REACT_APP
if: env.IS_NOT_FORK && env.IS_TESTABLE_TEMPLATE
uses: "./.github/actions/create_mrt"
with:
mobify_user: ${{ secrets.MOBIFY_CLIENT_USER }}
mobify_api_key: ${{ secrets.MOBIFY_CLIENT_API_KEY }}

- name: Push Bundle to MRT
if: env.IS_NOT_FORK && env.IS_TEMPLATE_FROM_RETAIL_REACT_APP
if: env.IS_NOT_FORK && env.IS_TESTABLE_TEMPLATE
uses: "./.github/actions/push_to_mrt"
with:
DEVELOP: ${{ env.DEVELOP }}
RELEASE: ${{ env.RELEASE }}

- name: Send GitHub Action data to Slack workflow (Generated)
id: slack
if: env.IS_NOT_FORK && env.IS_TEMPLATE_FROM_RETAIL_REACT_APP && env.DEVELOP && failure()
if: env.IS_NOT_FORK && env.IS_TESTABLE_TEMPLATE && env.DEVELOP && failure()
uses: slackapi/[email protected]
with:
payload: |
Expand All @@ -220,7 +220,7 @@ jobs:
template: [test-project, retail-react-app-demo, express-minimal-test-project, typescript-minimal-test-project]
runs-on: windows-latest
env:
IS_TEMPLATE_FROM_RETAIL_REACT_APP: ${{ matrix.template == 'test-project' || matrix.template == 'retail-react-app-demo' }}
IS_TESTABLE_TEMPLATE: ${{ matrix.template == 'test-project' || matrix.template == 'retail-react-app-demo' }}
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -241,19 +241,19 @@ jobs:
timeout-minutes: 5

- name: Run unit tests
if: env.IS_TEMPLATE_FROM_RETAIL_REACT_APP
if: env.IS_TESTABLE_TEMPLATE
uses: "./.github/actions/unit_tests"
with:
cwd: generated-${{ matrix.template }}

- name: Smoke test scripts
if: env.IS_TEMPLATE_FROM_RETAIL_REACT_APP
if: env.IS_TESTABLE_TEMPLATE
uses: "./.github/actions/smoke_tests"
with:
dir: generated-${{ matrix.template }}

- name: Count Generated Project Dependencies
if: env.IS_TEMPLATE_FROM_RETAIL_REACT_APP
if: env.IS_TESTABLE_TEMPLATE
uses: "./.github/actions/count_deps"

- name: Store Verdaccio logfile artifact
Expand Down

0 comments on commit 09058b6

Please sign in to comment.