Merge pull request #843 from libgit2/cmn/ci-linux-versions

ci: be less precise with our ruby version with setup-ruby
libgit2 · Apr 9, 2020 · 068075a · 068075a
2 parents 5807a7e + 310ba93
commit 068075a
Showing 1 changed file with 29 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,13 +8,40 @@ on:
     - maint/*
 
 jobs:
-  build:
+  macOS:
     strategy:
       fail-fast: false
       matrix:
         ruby: [ '2.4.9', '2.5.7', '2.6.5', '2.7.0' ]
-        os: [ ubuntu-18.04, macOS-10.14 ]
+        os: [ macOS-latest ]
+    runs-on: ${{ matrix.os }}
+
+    name: Ruby ${{ matrix.ruby }} on ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@master
+    - name: update submodule
+      run: git submodule update --init
+    - name: Install macOS packages
+      run: ./vendor/libgit2/azure-pipelines/setup-osx.sh
+    - name: Set up Ruby on macOS
+      run: |
+        brew install rbenv
+        rbenv install ${{ matrix.ruby }}
+        rbenv local ${{ matrix.ruby }}
+    - name: run build
+      run: |
+        eval "$(rbenv init -)"
+        ruby --version
+        gem install bundler
+        bundle install --path vendor
+        ./script/travisbuild
 
+  ubuntu:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.4', '2.5', '2.6', '2.7' ]
+        os: [ ubuntu-18.04 ]
     runs-on: ${{ matrix.os }}
 
     name: Ruby ${{ matrix.ruby }} on ${{ matrix.os }}
@@ -23,27 +50,15 @@ jobs:
     - name: update submodule
       run: git submodule update --init
     - name: Install Linux packages
-      if: runner.os == 'Linux'
       run: |
         sudo apt update
         sudo apt install -y cmake libssh2-1-dev openssh-client openssh-server
-    - name: Install macOS packages
-      if: runner.os == 'macOS'
-      run: ./vendor/libgit2/azure-pipelines/setup-osx.sh
     - name: Set up Ruby on Linux
-      if: runner.os == 'Linux'
       uses: actions/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-    - name: Set up Ruby on macOS
-      if: runner.os == 'macOS'
-      run: |
-        brew install rbenv
-        rbenv install ${{ matrix.ruby }}
-        rbenv local ${{ matrix.ruby }}
     - name: run build
       run: |
-        if [ -x rbenv ]; then eval "$(rbenv init -)"; fi
         ruby --version
         gem install bundler
         bundle install --path vendor