From bc4bb0a8450d6c9d69a5d073019c374cc5f801ff Mon Sep 17 00:00:00 2001 From: Hardik Joshi Date: Thu, 26 Sep 2024 16:56:00 +0530 Subject: [PATCH 1/5] setup java early in steps and cach maven --- .github/workflows/e2e_test.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/e2e_test.yml b/.github/workflows/e2e_test.yml index 7ad1154a1..0ae0d7d67 100644 --- a/.github/workflows/e2e_test.yml +++ b/.github/workflows/e2e_test.yml @@ -26,6 +26,14 @@ jobs: 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 steps: + - name: Set up Java + uses: actions/setup-java@v4 + if: matrix.java-version + with: + distribution: 'temurin' + java-version: ${{ matrix.java-version }} + cache: maven + - name: Start neo4j run: docker run --name neo4j --env NEO4J_AUTH=neo4j/password --env NEO4J_ACCEPT_LICENSE_AGREEMENT=yes --env NEO4J_dbms_directories_import= -p7687:7687 -p7474:7474 -v `pwd`/tmp:/var/lib/neo4j/import --rm neo4j:${{ matrix.neo4j }}-enterprise & @@ -36,13 +44,6 @@ jobs: with: ruby-version: ${{ matrix.ruby }} - - name: Set up Java - uses: actions/setup-java@v3 - if: matrix.java-version - with: - distribution: 'temurin' - java-version: ${{ matrix.java-version }} - - name: Wait for neo4j run: while [ $((curl localhost:7474/ > /dev/null 2>&1); echo $?) -ne 0 ]; do sleep 1; done From 4967f84166f27cbb5cee5318a183969815e62c85 Mon Sep 17 00:00:00 2001 From: Hardik Joshi Date: Thu, 26 Sep 2024 16:58:32 +0530 Subject: [PATCH 2/5] moving checkout at top --- .github/workflows/e2e_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e_test.yml b/.github/workflows/e2e_test.yml index 0ae0d7d67..93fce2389 100644 --- a/.github/workflows/e2e_test.yml +++ b/.github/workflows/e2e_test.yml @@ -26,6 +26,8 @@ jobs: 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 steps: + - uses: actions/checkout@v3 + - name: Set up Java uses: actions/setup-java@v4 if: matrix.java-version @@ -37,8 +39,6 @@ jobs: - name: Start neo4j run: docker run --name neo4j --env NEO4J_AUTH=neo4j/password --env NEO4J_ACCEPT_LICENSE_AGREEMENT=yes --env NEO4J_dbms_directories_import= -p7687:7687 -p7474:7474 -v `pwd`/tmp:/var/lib/neo4j/import --rm neo4j:${{ matrix.neo4j }}-enterprise & - - uses: actions/checkout@v3 - - name: Set up Ruby uses: ruby/setup-ruby@v1 with: From 3baa3b59690ba0fb333b3c6e6df9b16698a837e9 Mon Sep 17 00:00:00 2001 From: Hardik Joshi Date: Thu, 26 Sep 2024 17:07:40 +0530 Subject: [PATCH 3/5] Update e2e_test.yml --- .github/workflows/e2e_test.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/e2e_test.yml b/.github/workflows/e2e_test.yml index 93fce2389..283eaf7ed 100644 --- a/.github/workflows/e2e_test.yml +++ b/.github/workflows/e2e_test.yml @@ -26,8 +26,16 @@ jobs: 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 steps: + - name: Start neo4j + run: docker run --name neo4j --env NEO4J_AUTH=neo4j/password --env NEO4J_ACCEPT_LICENSE_AGREEMENT=yes --env NEO4J_dbms_directories_import= -p7687:7687 -p7474:7474 -v `pwd`/tmp:/var/lib/neo4j/import --rm neo4j:${{ matrix.neo4j }}-enterprise & + - uses: actions/checkout@v3 + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby }} + - name: Set up Java uses: actions/setup-java@v4 if: matrix.java-version @@ -36,14 +44,6 @@ jobs: java-version: ${{ matrix.java-version }} cache: maven - - name: Start neo4j - run: docker run --name neo4j --env NEO4J_AUTH=neo4j/password --env NEO4J_ACCEPT_LICENSE_AGREEMENT=yes --env NEO4J_dbms_directories_import= -p7687:7687 -p7474:7474 -v `pwd`/tmp:/var/lib/neo4j/import --rm neo4j:${{ matrix.neo4j }}-enterprise & - - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby }} - - name: Wait for neo4j run: while [ $((curl localhost:7474/ > /dev/null 2>&1); echo $?) -ne 0 ]; do sleep 1; done From 1d418540b0b2b92750eacd63c346b88930c0c2b7 Mon Sep 17 00:00:00 2001 From: Hardik Joshi Date: Thu, 26 Sep 2024 17:08:33 +0530 Subject: [PATCH 4/5] use v3 instead --- .github/workflows/e2e_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e_test.yml b/.github/workflows/e2e_test.yml index 283eaf7ed..08a2a009f 100644 --- a/.github/workflows/e2e_test.yml +++ b/.github/workflows/e2e_test.yml @@ -37,7 +37,7 @@ jobs: ruby-version: ${{ matrix.ruby }} - name: Set up Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v3 if: matrix.java-version with: distribution: 'temurin' From be42b5b3dcd6110994c350abf2beccf0bfc3941b Mon Sep 17 00:00:00 2001 From: Hardik Joshi Date: Thu, 26 Sep 2024 17:09:27 +0530 Subject: [PATCH 5/5] Update e2e_test.yml --- .github/workflows/e2e_test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/e2e_test.yml b/.github/workflows/e2e_test.yml index 08a2a009f..df582dd94 100644 --- a/.github/workflows/e2e_test.yml +++ b/.github/workflows/e2e_test.yml @@ -37,12 +37,11 @@ jobs: ruby-version: ${{ matrix.ruby }} - name: Set up Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 if: matrix.java-version with: distribution: 'temurin' java-version: ${{ matrix.java-version }} - cache: maven - name: Wait for neo4j run: while [ $((curl localhost:7474/ > /dev/null 2>&1); echo $?) -ne 0 ]; do sleep 1; done