From d6dcc4218a147ecc34a9035f6da930e5f7a8c308 Mon Sep 17 00:00:00 2001 From: Chiedo Date: Thu, 15 Oct 2020 14:14:33 -0400 Subject: [PATCH 1/3] Default to tests running if the skip action errors out --- .github/workflows/browser-test.yml | 6 +++--- .github/workflows/test.yml | 28 ++++++++++++++-------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/browser-test.yml b/.github/workflows/browser-test.yml index e9321e087857..3f93beb10fb1 100644 --- a/.github/workflows/browser-test.yml +++ b/.github/workflows/browser-test.yml @@ -24,17 +24,17 @@ jobs: steps: # Each of these ifs needs to be repeated at each step to make sure the required check still runs # Even if if doesn't do anything - - if: ${{ needs.see_if_should_skip.outputs.should_skip == 'false' }} + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} name: Checkout uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675 - - if: ${{ needs.see_if_should_skip.outputs.should_skip == 'false' }} + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} name: Install uses: ianwalter/puppeteer@12728ddef82390d1ecd4732fb543f62177392fbb with: args: npm ci - - if: ${{ needs.see_if_should_skip.outputs.should_skip == 'false' }} + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} name: Test uses: ianwalter/puppeteer@12728ddef82390d1ecd4732fb543f62177392fbb with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0fcfb615cfbc..05b91f72067c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,23 +34,23 @@ jobs: steps: # Each of these ifs needs to be repeated at each step to make sure the required check still runs # Even if if doesn't do anything - - if: ${{ needs.see_if_should_skip.outputs.should_skip == 'false' }} + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} name: Check out repo uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675 - - if: ${{ needs.see_if_should_skip.outputs.should_skip == 'false' }} + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} name: Setup node uses: actions/setup-node@56899e050abffc08c2b3b61f3ec6a79a9dc3223d with: node-version: 14.x - - if: ${{ needs.see_if_should_skip.outputs.should_skip == 'false' }} + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} name: Get npm cache directory id: npm-cache run: | echo "::set-output name=dir::$(npm config get cache)" - - if: ${{ needs.see_if_should_skip.outputs.should_skip == 'false' }} + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} name: Cache node modules uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16 with: @@ -59,15 +59,15 @@ jobs: restore-keys: | ${{ runner.os }}-node- - - if: ${{ needs.see_if_should_skip.outputs.should_skip == 'false' }} + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} name: Install dependencies run: npm ci - - if: ${{ needs.see_if_should_skip.outputs.should_skip == 'false' }} + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} name: Run linter run: npx standard - - if: ${{ needs.see_if_should_skip.outputs.should_skip == 'false' }} + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} name: Check dependencies run: npm run check-deps test: @@ -80,23 +80,23 @@ jobs: steps: # Each of these ifs needs to be repeated at each step to make sure the required check still runs # Even if if doesn't do anything - - if: ${{ needs.see_if_should_skip.outputs.should_skip == 'false' }} + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} name: Check out repo uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675 - - if: ${{ needs.see_if_should_skip.outputs.should_skip == 'false' }} + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} name: Setup node uses: actions/setup-node@56899e050abffc08c2b3b61f3ec6a79a9dc3223d with: node-version: 14.x - - if: ${{ needs.see_if_should_skip.outputs.should_skip == 'false' }} + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} name: Get npm cache directory id: npm-cache run: | echo "::set-output name=dir::$(npm config get cache)" - - if: ${{ needs.see_if_should_skip.outputs.should_skip == 'false' }} + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} name: Cache node modules uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16 with: @@ -105,15 +105,15 @@ jobs: restore-keys: | ${{ runner.os }}-node- - - if: ${{ needs.see_if_should_skip.outputs.should_skip == 'false' }} + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} name: Install dependencies run: npm ci - - if: ${{ needs.see_if_should_skip.outputs.should_skip == 'false' }} + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} name: Run build script run: npm run build - - if: ${{ needs.see_if_should_skip.outputs.should_skip == 'false' }} + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} name: Run tests run: npx jest tests/${{ matrix.test-group }}/ From 092bd6b163d8ffc9bfd44d06236eb182d40f89d6 Mon Sep 17 00:00:00 2001 From: Chiedo Date: Thu, 15 Oct 2020 14:24:34 -0400 Subject: [PATCH 2/3] Fix docker runs --- .github/allowed-actions.js | 2 +- .github/workflows/autoupdate-branch.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/allowed-actions.js b/.github/allowed-actions.js index a1331a3878ee..9004590d34c7 100644 --- a/.github/allowed-actions.js +++ b/.github/allowed-actions.js @@ -17,7 +17,7 @@ module.exports = [ 'actions/stale@44f9eae0adddf72dbf3eedfacc999f70afcec1a8', 'crowdin/github-action@fd9429dd63d6c0f8a8cb4b93ad8076990bd6e688', 'dawidd6/action-delete-branch@47743101a121ad657031e6704086271ca81b1911', - 'docker://chinthakagodawita/autoupdate-action:4d72a15b5989091e07d6f4ce4cd3afb7b835ad1e68190937df778b702a547cdc', + 'docker://chinthakagodawita/autoupdate-action::v1', 'fkirc/skip-duplicate-actions@a12175f6209d4805b5a163d723270be2a0dc7b36', 'github/codeql-action/analyze@v1', 'github/codeql-action/init@v1', diff --git a/.github/workflows/autoupdate-branch.yml b/.github/workflows/autoupdate-branch.yml index 6bc85de89890..d3903995f8ea 100644 --- a/.github/workflows/autoupdate-branch.yml +++ b/.github/workflows/autoupdate-branch.yml @@ -8,7 +8,7 @@ jobs: name: autoupdate runs-on: ubuntu-18.04 steps: - - uses: docker://chinthakagodawita/autoupdate-action:4d72a15b5989091e07d6f4ce4cd3afb7b835ad1e68190937df778b702a547cdc + - uses: docker://chinthakagodawita/autoupdate-action::v1 env: GITHUB_TOKEN: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }} PR_FILTER: labelled From 85f334de210d03436a9efc93199c9807f691bfd3 Mon Sep 17 00:00:00 2001 From: Chiedo Date: Thu, 15 Oct 2020 15:04:53 -0400 Subject: [PATCH 3/3] Fix docker --- .github/allowed-actions.js | 2 +- .github/workflows/autoupdate-branch.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/allowed-actions.js b/.github/allowed-actions.js index 9004590d34c7..48d703e24307 100644 --- a/.github/allowed-actions.js +++ b/.github/allowed-actions.js @@ -17,7 +17,7 @@ module.exports = [ 'actions/stale@44f9eae0adddf72dbf3eedfacc999f70afcec1a8', 'crowdin/github-action@fd9429dd63d6c0f8a8cb4b93ad8076990bd6e688', 'dawidd6/action-delete-branch@47743101a121ad657031e6704086271ca81b1911', - 'docker://chinthakagodawita/autoupdate-action::v1', + 'docker://chinthakagodawita/autoupdate-action:v1', 'fkirc/skip-duplicate-actions@a12175f6209d4805b5a163d723270be2a0dc7b36', 'github/codeql-action/analyze@v1', 'github/codeql-action/init@v1', diff --git a/.github/workflows/autoupdate-branch.yml b/.github/workflows/autoupdate-branch.yml index d3903995f8ea..331f2a0083f1 100644 --- a/.github/workflows/autoupdate-branch.yml +++ b/.github/workflows/autoupdate-branch.yml @@ -8,7 +8,7 @@ jobs: name: autoupdate runs-on: ubuntu-18.04 steps: - - uses: docker://chinthakagodawita/autoupdate-action::v1 + - uses: docker://chinthakagodawita/autoupdate-action:v1 env: GITHUB_TOKEN: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }} PR_FILTER: labelled