From 13cdd0a5adddc623e7d5d3566a751645e4f2313a Mon Sep 17 00:00:00 2001 From: Yashwant Date: Tue, 22 Apr 2025 11:00:22 +0530 Subject: [PATCH 1/2] upgrading ubuntu runner to latest --- .github/workflows/build.yaml | 6 +++--- .github/workflows/release.yaml | 6 +++--- .github/workflows/smoke-test.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 87fa8fc9..a5ab7127 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -10,7 +10,7 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation - name: Check out code @@ -40,7 +40,7 @@ jobs: JVM_OPTS: -Xmx1g TERM: dumb muzzle: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Check out code uses: actions/checkout@v2.3.4 @@ -71,7 +71,7 @@ jobs: #TODO # dependency-check: -# runs-on: ubuntu-20.04 +# runs-on: ubuntu-latest # steps: # - name: Check out code # uses: actions/checkout@v2.3.4 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 07909fff..9a943cbf 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -5,7 +5,7 @@ on: jobs: test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation - name: Check out code @@ -34,7 +34,7 @@ jobs: TERM: dumb smoke-test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: matrix: suite: [ "glassfish", "jetty", "liberty", "tomcat", "tomee", "wildfly", "other" ] @@ -68,7 +68,7 @@ jobs: release: needs: [ test, smoke-test ] - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation - name: Check out code diff --git a/.github/workflows/smoke-test.yml b/.github/workflows/smoke-test.yml index b180b82d..c98db4d7 100644 --- a/.github/workflows/smoke-test.yml +++ b/.github/workflows/smoke-test.yml @@ -10,7 +10,7 @@ on: jobs: smoke-test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: matrix: suite: [ "glassfish", "jetty", "liberty", "tomcat", "tomee", "wildfly", "other" ] From 36ff4f76b493886265dbaef8cc842d984de17c0f Mon Sep 17 00:00:00 2001 From: Yashwant Date: Tue, 22 Apr 2025 11:34:53 +0530 Subject: [PATCH 2/2] updating to use java 11 adoption --- .../workflows/build-springboot-smoke-dist.yml | 2 ++ .github/workflows/build-test-matrix.yaml | 7 ++++-- .github/workflows/build.yaml | 16 +++++++++++-- .github/workflows/release.yaml | 24 ++++++++++++++++--- .github/workflows/smoke-test.yml | 8 ++++++- 5 files changed, 49 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-springboot-smoke-dist.yml b/.github/workflows/build-springboot-smoke-dist.yml index fdda6418..0a56b1ae 100644 --- a/.github/workflows/build-springboot-smoke-dist.yml +++ b/.github/workflows/build-springboot-smoke-dist.yml @@ -42,3 +42,5 @@ jobs: ./gradlew jib -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace -Ptag=$TAG ./gradlew jib -PtargetJDK=15 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace -Ptag=$TAG working-directory: smoke-tests/springboot + env: + JVM_OPTS: -Xmx1g --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED diff --git a/.github/workflows/build-test-matrix.yaml b/.github/workflows/build-test-matrix.yaml index 7ec3ff95..3d4e9e78 100644 --- a/.github/workflows/build-test-matrix.yaml +++ b/.github/workflows/build-test-matrix.yaml @@ -14,8 +14,9 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up JDK 11 for running Gradle - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: adopt java-version: 11 - name: Cache gradle dependencies @@ -34,4 +35,6 @@ jobs: TAG="$(date '+%Y%m%d').$GITHUB_RUN_ID" echo "Using extra tag $TAG" ./gradlew buildMatrix pushMatrix -PextraTag=$TAG - working-directory: smoke-tests/matrix \ No newline at end of file + working-directory: smoke-tests/matrix + env: + JVM_OPTS: -Xmx1g --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED \ No newline at end of file diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a5ab7127..28892817 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -21,6 +21,12 @@ jobs: fetch-depth: 0 submodules: true + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: adopt + java-version: 11 + - name: create checksum file uses: hypertrace/github-actions/checksum@main @@ -37,7 +43,7 @@ jobs: - name: build run: make build env: - JVM_OPTS: -Xmx1g + JVM_OPTS: -Xmx1g --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED TERM: dumb muzzle: runs-on: ubuntu-latest @@ -50,6 +56,12 @@ jobs: fetch-depth: 0 submodules: true + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: adopt + java-version: 11 + - name: create checksum file uses: hypertrace/github-actions/checksum@main @@ -66,7 +78,7 @@ jobs: - name: muzzle run: make muzzle env: - JVM_OPTS: -Xmx1g + JVM_OPTS: -Xmx1g --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED TERM: dumb #TODO diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 9a943cbf..b83dca4f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -14,6 +14,12 @@ jobs: fetch-depth: 0 submodules: true + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: adopt + java-version: 11 + - name: create checksum file uses: hypertrace/github-actions/checksum@main @@ -30,7 +36,7 @@ jobs: - name: build run: make build env: - JVM_OPTS: -Xmx1g + JVM_OPTS: -Xmx1g --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED TERM: dumb smoke-test: @@ -47,6 +53,12 @@ jobs: fetch-depth: 0 submodules: true + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: adopt + java-version: 11 + - name: create checksum file uses: hypertrace/github-actions/checksum@main @@ -63,7 +75,7 @@ jobs: - name: smoke-test run: make smoke-test SMOKE_TEST_SUITE=${{ matrix.suite }} env: - JVM_OPTS: -Xmx1g + JVM_OPTS: -Xmx1g --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED TERM: dumb release: @@ -77,6 +89,12 @@ jobs: fetch-depth: 0 submodules: true + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: adopt + java-version: 11 + - name: create checksum file uses: hypertrace/github-actions/checksum@main @@ -96,7 +114,7 @@ jobs: ORG_GRADLE_PROJECT_signingKey=$(echo $SIGNING_KEY | base64 -d) ./gradlew publish ./gradlew closeAndReleaseRepository env: - JVM_OPTS: -Xmx1g + JVM_OPTS: -Xmx1g --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED TERM: dumb ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.ORG_GRADLE_PROJECT_OSSRHUSERNAME }} ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.ORG_GRADLE_PROJECT_OSSRHPASSWORD }} diff --git a/.github/workflows/smoke-test.yml b/.github/workflows/smoke-test.yml index c98db4d7..6c209d97 100644 --- a/.github/workflows/smoke-test.yml +++ b/.github/workflows/smoke-test.yml @@ -25,6 +25,12 @@ jobs: fetch-depth: 0 submodules: true + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: adopt + java-version: 11 + - name: create checksum file uses: hypertrace/github-actions/checksum@main @@ -41,5 +47,5 @@ jobs: - name: smoke-test run: make smoke-test SMOKE_TEST_SUITE=${{ matrix.suite }} env: - JVM_OPTS: -Xmx1g + JVM_OPTS: -Xmx1g --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED TERM: dumb