Skip to content

Commit 068075a

Browse files
authored
Merge pull request #843 from libgit2/cmn/ci-linux-versions
ci: be less precise with our ruby version with setup-ruby
2 parents 5807a7e + 310ba93 commit 068075a

File tree

1 file changed

+29
-14
lines changed

1 file changed

+29
-14
lines changed

.github/workflows/ci.yml

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,40 @@ on:
88
- maint/*
99

1010
jobs:
11-
build:
11+
macOS:
1212
strategy:
1313
fail-fast: false
1414
matrix:
1515
ruby: [ '2.4.9', '2.5.7', '2.6.5', '2.7.0' ]
16-
os: [ ubuntu-18.04, macOS-10.14 ]
16+
os: [ macOS-latest ]
17+
runs-on: ${{ matrix.os }}
18+
19+
name: Ruby ${{ matrix.ruby }} on ${{ matrix.os }}
20+
steps:
21+
- uses: actions/checkout@master
22+
- name: update submodule
23+
run: git submodule update --init
24+
- name: Install macOS packages
25+
run: ./vendor/libgit2/azure-pipelines/setup-osx.sh
26+
- name: Set up Ruby on macOS
27+
run: |
28+
brew install rbenv
29+
rbenv install ${{ matrix.ruby }}
30+
rbenv local ${{ matrix.ruby }}
31+
- name: run build
32+
run: |
33+
eval "$(rbenv init -)"
34+
ruby --version
35+
gem install bundler
36+
bundle install --path vendor
37+
./script/travisbuild
1738
39+
ubuntu:
40+
strategy:
41+
fail-fast: false
42+
matrix:
43+
ruby: [ '2.4', '2.5', '2.6', '2.7' ]
44+
os: [ ubuntu-18.04 ]
1845
runs-on: ${{ matrix.os }}
1946

2047
name: Ruby ${{ matrix.ruby }} on ${{ matrix.os }}
@@ -23,27 +50,15 @@ jobs:
2350
- name: update submodule
2451
run: git submodule update --init
2552
- name: Install Linux packages
26-
if: runner.os == 'Linux'
2753
run: |
2854
sudo apt update
2955
sudo apt install -y cmake libssh2-1-dev openssh-client openssh-server
30-
- name: Install macOS packages
31-
if: runner.os == 'macOS'
32-
run: ./vendor/libgit2/azure-pipelines/setup-osx.sh
3356
- name: Set up Ruby on Linux
34-
if: runner.os == 'Linux'
3557
uses: actions/setup-ruby@v1
3658
with:
3759
ruby-version: ${{ matrix.ruby }}
38-
- name: Set up Ruby on macOS
39-
if: runner.os == 'macOS'
40-
run: |
41-
brew install rbenv
42-
rbenv install ${{ matrix.ruby }}
43-
rbenv local ${{ matrix.ruby }}
4460
- name: run build
4561
run: |
46-
if [ -x rbenv ]; then eval "$(rbenv init -)"; fi
4762
ruby --version
4863
gem install bundler
4964
bundle install --path vendor

0 commit comments

Comments
 (0)