From 96f8d30b6be957616f0cf43a5b621e1d1cea7916 Mon Sep 17 00:00:00 2001 From: Peter Morgenstern Date: Wed, 10 Jan 2024 06:07:36 +0100 Subject: [PATCH] Don't remove lock file for JRuby and TruffleRuby nightly --- .github/workflows/jruby-nightly.yml | 10 +++++----- .github/workflows/truffleruby-nightly.yml | 10 +++++----- Gemfile | 7 +++++-- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/jruby-nightly.yml b/.github/workflows/jruby-nightly.yml index e8fadb6..bdb101b 100644 --- a/.github/workflows/jruby-nightly.yml +++ b/.github/workflows/jruby-nightly.yml @@ -1,16 +1,16 @@ name: JRuby Nightly -on: - schedule: - # Checks daily - - cron: "0 0 * * *" +on: push +# on: +# schedule: +# # Checks daily +# - cron: "0 0 * * *" jobs: TestsOnNightly: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - run: rm Gemfile.lock - uses: ruby/setup-ruby@v1 with: ruby-version: jruby-head diff --git a/.github/workflows/truffleruby-nightly.yml b/.github/workflows/truffleruby-nightly.yml index 78e623d..120bece 100644 --- a/.github/workflows/truffleruby-nightly.yml +++ b/.github/workflows/truffleruby-nightly.yml @@ -1,16 +1,16 @@ name: TruffleRuby Nightly -on: - schedule: - # Checks daily - - cron: "0 0 * * *" +on: push +# on: +# schedule: +# # Checks daily +# - cron: "0 0 * * *" jobs: TestsOnNightly: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - run: rm Gemfile.lock - uses: ruby/setup-ruby@v1 with: ruby-version: truffleruby-head diff --git a/Gemfile b/Gemfile index 7b53495..38c0c6a 100644 --- a/Gemfile +++ b/Gemfile @@ -5,8 +5,6 @@ gemspec gem "rake" gem "rspec" -gem "racc" # Needed for JRuby, see https://github.com/jruby/jruby/issues/6581 - platforms :mri do gem "byebug" gem "prettier" @@ -18,3 +16,8 @@ platforms :mri do gem "simplecov" gem "solargraph" end + +platforms :jruby do + # Needed for JRuby, see https://github.com/jruby/jruby/issues/6581 + gem "racc", force_ruby_platform: true +end