diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2023-03-10 07:45:29 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2023-03-10 07:45:29 +0900 |
| commit | ea6ace056c51940e7e6c45a19fc117f81e3f6604 (patch) | |
| tree | b1e4e0616846df84d45e2f2abae21f81c00fcc59 | |
| parent | 7d390a3dda779e3e2e830752627c3a674aeadc0b (diff) | |
| download | psych-ea6ace056c51940e7e6c45a19fc117f81e3f6604.tar.gz | |
Merge windows jobs into ubuntu
| -rw-r--r-- | .github/workflows/ubuntu.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/windows.yml | 28 |
2 files changed, 5 insertions, 29 deletions
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 47eddf4..345dd12 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -15,7 +15,11 @@ jobs: fail-fast: false matrix: ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }} - os: [ ubuntu-latest, macos-latest ] + os: [ ubuntu-latest, macos-latest, windows-latest ] + include: + - { os: windows-latest, ruby: ucrt } + - { os: windows-latest, ruby: mingw } + - { os: windows-latest, ruby: mswin } steps: - name: Install libraries run: sudo apt install haveged libyaml-dev diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml deleted file mode 100644 index 37e80ce..0000000 --- a/.github/workflows/windows.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: windows - -on: [push, pull_request] - -jobs: - build: - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - ruby: [ ucrt, mingw, mswin, 3.1, "3.0", 2.7, 2.6, 2.5, 2.4 ] - os: [ windows-latest ] - steps: - - uses: actions/checkout@v3 - - name: Set up Ruby - uses: ruby/setup-ruby-pkgs@v1 - with: - ruby-version: ${{ matrix.ruby }} - vcpkg: libyaml - - name: Install dependencies - run: bundle install - - name: Run test - run: rake - - name: Install gem - run: rake install - # use all possible head strings - if: | - !(contains('ucrt mingw mswin head', matrix.ruby)) |