summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2023-03-10 07:31:15 +0900
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2023-03-10 07:31:15 +0900
commit5ad2b46f59ee9e88d271241aeafd71639a9a9061 (patch)
tree367ebadfa0947cf42395daa536ccffb22d0978d9
parent13d7c40f4ebff5f2d0e3026e2b0c35b348d0af93 (diff)
downloadpsych-5ad2b46f59ee9e88d271241aeafd71639a9a9061.tar.gz
Merge jruby jobs into ubuntu
-rw-r--r--.github/workflows/ubuntu-jruby.yml23
-rw-r--r--.github/workflows/ubuntu.yml2
2 files changed, 1 insertions, 24 deletions
diff --git a/.github/workflows/ubuntu-jruby.yml b/.github/workflows/ubuntu-jruby.yml
deleted file mode 100644
index 7fadea2..0000000
--- a/.github/workflows/ubuntu-jruby.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: ubuntu-jruby
-
-on: [push, pull_request]
-
-jobs:
- build:
- runs-on: ubuntu-latest
- strategy:
- fail-fast: false
- matrix:
- ruby: [ jruby, jruby-head ]
- steps:
- - uses: actions/checkout@v3
- - name: Set up Ruby
- uses: ruby/setup-ruby@v1
- with:
- ruby-version: ${{ matrix.ruby }}
- - name: Install dependencies
- run: bundle install --jobs 1
- - name: compile
- run: bundle exec rake compile
- - name: test
- run: bundle exec rake test
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 96635a2..f0cb1be 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -6,7 +6,7 @@ jobs:
ruby-versions:
uses: ruby/actions/.github/workflows/ruby_versions.yml@master
with:
- engine: cruby
+ engine: cruby-jruby
min_version: 2.4
build: