From 73f8169dd91a503f1df73049cc47957881ab57a9 Mon Sep 17 00:00:00 2001 From: Hardik Joshi Date: Sat, 13 Jan 2024 01:56:58 +0530 Subject: [PATCH] jruby excluded against rails 7 --- .github/workflows/e2e_test.yml | 7 +++++-- e2e_tests/setup.sh | 8 +++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e_test.yml b/.github/workflows/e2e_test.yml index b90898e67..45cba5df4 100644 --- a/.github/workflows/e2e_test.yml +++ b/.github/workflows/e2e_test.yml @@ -17,9 +17,12 @@ jobs: strategy: fail-fast: false matrix: - ruby: [ jruby-9.3.13.0, ruby-3.2.2 ] + ruby: [ jruby-9.4.5.0, ruby-3.2.2 ] neo4j: [ 5.15.0 ] - active_model: [ 7.1.2 ] + active_model: [ 7.1.2, 6.1.7.6 ] + exclude: + - ruby: jruby-9.4.5.0 + active_model: 7.1.2 env: ACTIVE_MODEL_VERSION: ${{ matrix.active_model }} JRUBY_OPTS: --debug -J-Xmx1280m -Xcompile.invokedynamic=false -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -Xcompile.mode=OFF diff --git a/e2e_tests/setup.sh b/e2e_tests/setup.sh index af079e847..8ccb99bb9 100755 --- a/e2e_tests/setup.sh +++ b/e2e_tests/setup.sh @@ -1,6 +1,12 @@ #!/bin/sh -gem install rails -v 7.1.2 --no-document +if [[ -n "$ACTIVE_MODEL_VERSION" ]] +then + gem install rails -v $ACTIVE_MODEL_VERSION --no-document +else + gem install rails -v 7.1.2 --no-document +fi + if [[ -n "$SHA" ]] then sed 's/.*gem '"'"'activegraph'"'"'.*/gem '"'"'activegraph'"'"', github: "neo4jrb\/activegraph", ref: "'"$SHA"'"/' docs/activegraph.rb > template.tmp