From 07253ecd514b2ec955b1c5c1ef89ba463825aee1 Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Thu, 15 Apr 2021 22:34:40 -0700 Subject: [PATCH] [actions] adjust shellcheck/windows tests to9 have a final "done" job --- .github/workflows/shellcheck.yml | 8 +++++++- .github/workflows/windows-npm.yml | 17 +++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index f56843d..a193faa 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -3,7 +3,7 @@ name: 'Tests: shellcheck' on: [pull_request, push] jobs: - shellcheck: + shellcheck_matrix: runs-on: ubuntu-latest strategy: matrix: @@ -29,3 +29,9 @@ jobs: - run: "shellcheck --version" - name: Run shellcheck on ${{ matrix.file }} run: shellcheck -s ${{ matrix.shell }} ${{ matrix.file }} + + shellcheck: + needs: [shellcheck_matrix] + runs-on: ubuntu-latest + steps: + - run: 'echo tests completed' diff --git a/.github/workflows/windows-npm.yml b/.github/workflows/windows-npm.yml index 2515a23..810536e 100755 --- a/.github/workflows/windows-npm.yml +++ b/.github/workflows/windows-npm.yml @@ -7,7 +7,7 @@ env: NVM_INSTALL_VERSION: ${{ github.sha }} jobs: - node_fail_install: + msys_fail_install: # Default installation does not work due to npm_config_prefix set to C:\npm\prefix name: 'MSYS fail prefix nvm install' runs-on: windows-latest @@ -18,7 +18,8 @@ jobs: curl -fsSLo- "https://raw.githubusercontent.com/${NVM_INSTALL_GITHUB_REPO}/${NVM_INSTALL_VERSION}/install.sh" | METHOD=script bash . "$HOME/.nvm/nvm.sh" ! nvm install --lts - nodes: + + msys_matrix: name: 'MSYS nvm install' runs-on: windows-latest strategy: @@ -39,7 +40,8 @@ jobs: fi . "$HOME/.nvm/nvm.sh" nvm install ${{ matrix.npm-node-version }} - node_cygwin: + + cygwin_matrix: name: 'Cygwin nvm install' runs-on: windows-latest steps: @@ -75,7 +77,8 @@ jobs: run: | cd %USERPROFILE%\cygwin\bin bash.exe "%USERPROFILE%\setup.sh" - wsl_nodes: + + wsl_matrix: name: 'WSL nvm install' runs-on: windows-latest env: @@ -104,3 +107,9 @@ jobs: fi . "$HOME/.nvm/nvm.sh" nvm install ${{ matrix.npm-node-version }} + + nvm_windows: + needs: [wsl_matrix, cygwin_matrix, msys_matrix, msys_fail_install] + runs-on: ubuntu-latest + steps: + - run: 'echo tests completed'