Skip to content

Commit 571d231

Browse files
authored
Merge pull request #428 from sparklemotion/flavorjones-upstream-ruby-head
ci: test edge rubies only in upstream.yml
2 parents f18d15e + 2239bd9 commit 571d231

File tree

3 files changed

+41
-5
lines changed

3 files changed

+41
-5
lines changed

.github/workflows/gem-install.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
fail-fast: false
6363
matrix:
6464
sys: ["enable", "disable"]
65-
ruby: ["2.7", "3.0", "3.1", "3.2", "head", "truffleruby-head"]
65+
ruby: ["2.7", "3.0", "3.1", "3.2"]
6666
runs-on: ubuntu-latest
6767
steps:
6868
- uses: actions/checkout@v4
@@ -82,7 +82,7 @@ jobs:
8282
fail-fast: false
8383
matrix:
8484
sys: ["enable", "disable"]
85-
ruby: ["3.1", "3.2", "truffleruby-head"]
85+
ruby: ["3.1", "3.2", "truffleruby"]
8686
runs-on: macos-latest
8787
steps:
8888
- uses: actions/checkout@v4

.github/workflows/sqlite3-ruby.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ jobs:
2828
ruby: ["3.2", "3.1", "3.0", "2.7"]
2929
lib: [system, packaged]
3030
include:
31-
- { os: ubuntu-latest, ruby: truffleruby-head, lib: packaged }
32-
- { os: ubuntu-latest, ruby: head, lib: packaged }
33-
- { os: ubuntu-latest, ruby: head, lib: system }
31+
- { os: ubuntu-latest, ruby: truffleruby, lib: packaged }
3432
- { os: windows-latest, ruby: ucrt, lib: system }
3533
- { os: windows-latest, ruby: mswin, lib: system }
3634

.github/workflows/upstream.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ on:
66
workflow_dispatch:
77
schedule:
88
- cron: "0 8 * * 3" # At 08:00 on Wednesday # https://crontab.guru/#0_8_*_*_3
9+
pull_request:
10+
types: [opened, synchronize]
11+
branches:
12+
- '*'
13+
paths:
14+
- .github/workflows/upstream.yml # this file
915

1016
jobs:
1117
sqlite-head:
@@ -21,3 +27,35 @@ jobs:
2127
bundler-cache: true
2228
- run: bundle exec rake compile -- --with-sqlite-source-dir=${GITHUB_WORKSPACE}/sqlite
2329
- run: bundle exec rake test
30+
31+
ruby-head:
32+
name: ${{matrix.ruby}}-${{matrix.lib}}
33+
strategy:
34+
fail-fast: false
35+
matrix:
36+
include:
37+
- { os: ubuntu-latest, ruby: truffleruby-head, lib: packaged }
38+
- { os: ubuntu-latest, ruby: head, lib: packaged }
39+
- { os: ubuntu-latest, ruby: head, lib: system }
40+
41+
runs-on: ${{matrix.os}}
42+
steps:
43+
- uses: actions/checkout@v4
44+
- uses: ruby/setup-ruby-pkgs@v1
45+
with:
46+
ruby-version: ${{matrix.ruby}}
47+
bundler-cache: true
48+
apt-get: libsqlite3-dev
49+
- if: matrix.lib == 'packaged'
50+
uses: actions/cache@v3
51+
with:
52+
path: ports
53+
key: ports-${{matrix.os}}-${{hashFiles('ext/sqlite3/extconf.rb','dependencies.yml')}}
54+
55+
- run: bundle exec rake compile -- --disable-system-libraries
56+
if: matrix.lib == 'packaged'
57+
58+
- run: bundle exec rake compile -- --enable-system-libraries
59+
if: matrix.lib == 'system'
60+
61+
- run: bundle exec rake test

0 commit comments

Comments
 (0)