diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2023-03-10 07:32:04 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2023-03-10 07:32:04 +0900 |
| commit | 824e23db86982cc203c0344fae8ea5a6ac8eef00 (patch) | |
| tree | 487d8439e693343b19e68910b7070be9a0213a77 | |
| parent | 5ad2b46f59ee9e88d271241aeafd71639a9a9061 (diff) | |
| download | psych-824e23db86982cc203c0344fae8ea5a6ac8eef00.tar.gz | |
Merge macos jobs into ubuntu
| -rw-r--r-- | .github/workflows/macos.yml | 26 | ||||
| -rw-r--r-- | .github/workflows/ubuntu.yml | 3 |
2 files changed, 2 insertions, 27 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml deleted file mode 100644 index ddca074..0000000 --- a/.github/workflows/macos.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: macos - -on: [push, pull_request] - -jobs: - build: - runs-on: macos-latest - strategy: - fail-fast: false - matrix: - ruby: [ head, 3.1, "3.0", 2.7, 2.6, 2.5, 2.4 ] - steps: - - uses: actions/checkout@v3 - - name: Install libraries - run: brew install libyaml - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby }} - - name: Install dependencies - run: bundle install - - name: Run test - run: rake - - name: Install gem - run: rake install - if: ${{ matrix.ruby != 'head' }} diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index f0cb1be..71a1410 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -10,11 +10,12 @@ jobs: min_version: 2.4 build: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }} + os: [ ubuntu-latest, macos-latest ] steps: - name: Install libraries run: sudo apt install haveged libyaml-dev |