diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2020-02-26 10:10:41 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2020-02-26 11:08:40 +0900 |
| commit | 2123c6ac0772b83005d50768784d47c515768b09 (patch) | |
| tree | c0b358a1e855676b21f11c3ca004dcd62fe894d7 | |
| parent | 944121faa028c3f1c0cd41b634be5e5294a59cd6 (diff) | |
| download | ruby-openssl-2123c6ac0772b83005d50768784d47c515768b09.tar.gz | |
.github/workflows: merge CI jobs into a single workflow
The "Ubuntu-macOS" and "Windows" workflows are both for the same
purpose. Merge them into a single workflow for clarity.
| -rw-r--r-- | .github/workflows/test.yml (renamed from .github/workflows/windows.yml) | 38 | ||||
| -rw-r--r-- | .github/workflows/ubuntu-macos.yml | 33 |
2 files changed, 32 insertions, 39 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/test.yml index 1638d25d..6d72e4d2 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/test.yml @@ -1,15 +1,43 @@ -name: Windows +name: CI on: [push, pull_request] jobs: - windows: + test: name: >- - ${{ matrix.ruby }} windows-latest - runs-on: windows-latest + ${{ matrix.os }} ${{ matrix.ruby }} + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: + os: [ ubuntu-latest, macos-latest ] + ruby: [ head, 2.7, 2.6, 2.5, 2.4, 2.3 ] + steps: + - name: repo checkout + uses: actions/checkout@v2 + + - name: load ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby }} + + - name: depends + run: rake install_dependencies + + - name: compile + run: rake compile -- --enable-debug + + - name: test + run: rake test TESTOPTS="-v --no-show-detail-immediately" OSSL_MDEBUG=1 + + test-windows: + name: >- + ${{ matrix.os }} ${{ matrix.ruby }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ windows-latest ] ruby: [ mswin, mingw, 2.7, 2.6, 2.5, 2.4, 2.3 ] steps: - name: repo checkout @@ -43,5 +71,3 @@ jobs: - name: test run: rake test TESTOPTS="-v --no-show-detail-immediately" OSSL_MDEBUG=1 - env: - CI: true diff --git a/.github/workflows/ubuntu-macos.yml b/.github/workflows/ubuntu-macos.yml deleted file mode 100644 index 1a45c365..00000000 --- a/.github/workflows/ubuntu-macos.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: Ubuntu-macOS - -on: [push, pull_request] - -jobs: - build: - name: >- - ${{ matrix.ruby }} ${{ matrix.os }} - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [ 'ubuntu-18.04', 'macos' ] - ruby: [ ruby-head, 2.7, 2.6, 2.5, 2.4, 2.3 ] - steps: - - name: repo checkout - uses: actions/checkout@v2 - - - name: load ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby }} - - - name: depends - run: rake install_dependencies - - - name: compile - run: rake compile -- --enable-debug - - - name: test - run: rake test TESTOPTS="-v --no-show-detail-immediately" OSSL_MDEBUG=1 - env: - CI: true |