From 824e23db86982cc203c0344fae8ea5a6ac8eef00 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Fri, 10 Mar 2023 07:32:04 +0900
Subject: Merge macos jobs into ubuntu

---
 .github/workflows/macos.yml  | 26 --------------------------
 .github/workflows/ubuntu.yml |  3 ++-
 2 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 .github/workflows/macos.yml

(limited to '.github')

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
-- 
cgit v1.2.1