From d625ebe4621a282356654562beff4ea5ef11c171 Mon Sep 17 00:00:00 2001 From: Koichi Nakashima Date: Tue, 3 Nov 2020 12:36:42 +0900 Subject: [PATCH] GitHub Actions: Remove matrix --- .github/workflows/ci.yml | 56 ++++++++++++---------------------------- 1 file changed, 16 insertions(+), 40 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5e5f728..18b1b3ee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,78 +8,54 @@ env: jobs: ubuntu-xenial: runs-on: ubuntu-16.04 - strategy: - matrix: - shell: [dash, bash, zsh, ksh, mksh, yash, posh, busybox ash] steps: - uses: actions/checkout@v2 - - run: echo "SH=${{ matrix.shell }}" >> $GITHUB_ENV - - run: sudo apt-get install -y "${SH%% *}" + - run: sudo apt-get install -y dash bash zsh ksh mksh yash posh busybox - name: Prepare for test - run: sudo $SH ./shellspec --task fixture:stat:prepare + run: sudo ./shellspec --task fixture:stat:prepare - name: Run various tests - run: contrib/various_test.sh + run: contrib/all.sh contrib/various_test.sh ubuntu-bionic: runs-on: ubuntu-18.04 - strategy: - matrix: - shell: [dash, bash, zsh, ksh, mksh, yash, posh, busybox ash] steps: - uses: actions/checkout@v2 - - run: echo "SH=${{ matrix.shell }}" >> $GITHUB_ENV - - run: sudo apt-get install -y "${SH%% *}" + - run: sudo apt-get install -y dash bash zsh ksh mksh yash posh busybox - name: Prepare for test - run: sudo $SH ./shellspec --task fixture:stat:prepare + run: sudo ./shellspec --task fixture:stat:prepare - name: Run various tests - run: contrib/various_test.sh + run: contrib/all.sh contrib/various_test.sh ubuntu-focal: runs-on: ubuntu-20.04 - strategy: - matrix: - shell: [dash, bash, zsh, ksh, mksh, yash, posh, busybox ash] steps: - uses: actions/checkout@v2 - - run: echo "SH=${{ matrix.shell }}" >> $GITHUB_ENV - - run: sudo apt-get install -y "${SH%% *}" + - run: sudo apt-get install -y dash bash zsh ksh mksh yash posh busybox - name: Prepare for test - run: sudo $SH ./shellspec --task fixture:stat:prepare + run: sudo ./shellspec --task fixture:stat:prepare - name: Run various tests - run: contrib/various_test.sh + run: contrib/all.sh contrib/various_test.sh macos-catalina: runs-on: macos-10.15 - strategy: - matrix: - shell: [sh, bash, zsh, ksh] steps: - uses: actions/checkout@v2 - - run: echo "SH=${{ matrix.shell }}" >> $GITHUB_ENV - name: Prepare for test - run: $SH ./shellspec --task fixture:stat:prepare + run: ./shellspec --task fixture:stat:prepare - name: Run various tests - run: contrib/various_test.sh + run: contrib/all.sh contrib/various_test.sh macos-bigsur: runs-on: macos-11.0 - strategy: - matrix: - shell: [sh, bash, zsh, ksh] steps: - uses: actions/checkout@v2 - - run: echo "SH=${{ matrix.shell }}" >> $GITHUB_ENV - name: Prepare for test - run: $SH ./shellspec --task fixture:stat:prepare + run: ./shellspec --task fixture:stat:prepare - name: Run various tests - run: contrib/various_test.sh + run: contrib/all.sh contrib/various_test.sh macos-brew: runs-on: macos-latest - strategy: - matrix: - shell: [dash, bash, zsh, ksh, mksh, yash] steps: - uses: actions/checkout@v2 - - run: echo "SH=${{ matrix.shell }}" >> $GITHUB_ENV - run: brew upgrade - - run: brew install "${SH%% *}" + - run: brew install dash bash zsh ksh mksh yash - name: Prepare for test - run: $SH ./shellspec --task fixture:stat:prepare + run: ./shellspec --task fixture:stat:prepare - name: Run various tests - run: contrib/various_test.sh + run: contrib/all.sh contrib/various_test.sh