From 434d22867e4c69c4c587d07cb5e593dc06ea9ced Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 21 Mar 2024 21:41:15 +0100 Subject: [PATCH 1/4] Try to debug new oracle runner --- .github/workflows/deployment-jdk-ea.yml | 103 ++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/.github/workflows/deployment-jdk-ea.yml b/.github/workflows/deployment-jdk-ea.yml index 4689a2b3172..f0c529658b0 100644 --- a/.github/workflows/deployment-jdk-ea.yml +++ b/.github/workflows/deployment-jdk-ea.yml @@ -235,3 +235,106 @@ jobs: The build of this PR is available at . comment_tag: download-link mode: recreate + print: + + strategy: + + fail-fast: false + + matrix: + + os: [ubuntu-22.04, ubuntu-20.04, macos-14, macos-13, macos-12, macos-11, windows-2022, windows-2019, buildjet-4vcpu-ubuntu-2204-arm] + + name: "${{ matrix.os }} x ${{ matrix.jdk }}" + + runs-on: ${{ matrix.os }} + + steps: + + - name: 'JAVA_HOME_8_*' + + shell: bash + + run: | + + echo "JAVA_HOME_8_X64 = $JAVA_HOME_8_X64" + + if [ -d "$JAVA_HOME_8_X64" ]; then + + $JAVA_HOME_8_X64/bin/java -version + + fi + + echo "JAVA_HOME_8_arm64 = $JAVA_HOME_8_arm64" + + if [ -d "$JAVA_HOME_8_arm64" ]; then + + $JAVA_HOME_8_arm64/bin/java -version + + fi + + - name: 'JAVA_HOME_11_*' + + shell: bash + + run: | + + echo "JAVA_HOME_11_X64 = $JAVA_HOME_11_X64" + + if [ -d "$JAVA_HOME_11_X64" ]; then + + $JAVA_HOME_11_X64/bin/java -version + + fi + + echo "JAVA_HOME_11_arm64 = $JAVA_HOME_11_arm64" + + if [ -d "$JAVA_HOME_11_arm64" ]; then + + $JAVA_HOME_11_arm64/bin/java -version + + fi + + - name: 'JAVA_HOME_17_*' + + shell: bash + + run: | + + echo "JAVA_HOME_17_X64 = $JAVA_HOME_17_X64" + + if [ -d "$JAVA_HOME_17_X64" ]; then + + $JAVA_HOME_17_X64/bin/java -version + + fi + + echo "JAVA_HOME_17_arm64 = $JAVA_HOME_17_arm64" + + if [ -d "$JAVA_HOME_17_arm64" ]; then + + $JAVA_HOME_17_arm64/bin/java -version + + fi + + - name: 'JAVA_HOME_21_*' + + shell: bash + + run: | + + echo "JAVA_HOME_21_X64 = $JAVA_HOME_21_X64" + + if [ -d "$JAVA_HOME_21_X64" ]; then + + $JAVA_HOME_21_X64/bin/java -version + + fi + + echo "JAVA_HOME_21_arm64 = $JAVA_HOME_21_arm64" + + if [ -d "$JAVA_HOME_21_arm64" ]; then + + $JAVA_HOME_21_arm64/bin/java -version + + fi From 447ad28cbe60d3c789841e9c64d3b963b363192a Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 21 Mar 2024 21:44:53 +0100 Subject: [PATCH 2/4] Revert "Try to debug new oracle runner" This reverts commit 434d22867e4c69c4c587d07cb5e593dc06ea9ced. --- .github/workflows/deployment-jdk-ea.yml | 103 ------------------------ 1 file changed, 103 deletions(-) diff --git a/.github/workflows/deployment-jdk-ea.yml b/.github/workflows/deployment-jdk-ea.yml index f0c529658b0..4689a2b3172 100644 --- a/.github/workflows/deployment-jdk-ea.yml +++ b/.github/workflows/deployment-jdk-ea.yml @@ -235,106 +235,3 @@ jobs: The build of this PR is available at . comment_tag: download-link mode: recreate - print: - - strategy: - - fail-fast: false - - matrix: - - os: [ubuntu-22.04, ubuntu-20.04, macos-14, macos-13, macos-12, macos-11, windows-2022, windows-2019, buildjet-4vcpu-ubuntu-2204-arm] - - name: "${{ matrix.os }} x ${{ matrix.jdk }}" - - runs-on: ${{ matrix.os }} - - steps: - - - name: 'JAVA_HOME_8_*' - - shell: bash - - run: | - - echo "JAVA_HOME_8_X64 = $JAVA_HOME_8_X64" - - if [ -d "$JAVA_HOME_8_X64" ]; then - - $JAVA_HOME_8_X64/bin/java -version - - fi - - echo "JAVA_HOME_8_arm64 = $JAVA_HOME_8_arm64" - - if [ -d "$JAVA_HOME_8_arm64" ]; then - - $JAVA_HOME_8_arm64/bin/java -version - - fi - - - name: 'JAVA_HOME_11_*' - - shell: bash - - run: | - - echo "JAVA_HOME_11_X64 = $JAVA_HOME_11_X64" - - if [ -d "$JAVA_HOME_11_X64" ]; then - - $JAVA_HOME_11_X64/bin/java -version - - fi - - echo "JAVA_HOME_11_arm64 = $JAVA_HOME_11_arm64" - - if [ -d "$JAVA_HOME_11_arm64" ]; then - - $JAVA_HOME_11_arm64/bin/java -version - - fi - - - name: 'JAVA_HOME_17_*' - - shell: bash - - run: | - - echo "JAVA_HOME_17_X64 = $JAVA_HOME_17_X64" - - if [ -d "$JAVA_HOME_17_X64" ]; then - - $JAVA_HOME_17_X64/bin/java -version - - fi - - echo "JAVA_HOME_17_arm64 = $JAVA_HOME_17_arm64" - - if [ -d "$JAVA_HOME_17_arm64" ]; then - - $JAVA_HOME_17_arm64/bin/java -version - - fi - - - name: 'JAVA_HOME_21_*' - - shell: bash - - run: | - - echo "JAVA_HOME_21_X64 = $JAVA_HOME_21_X64" - - if [ -d "$JAVA_HOME_21_X64" ]; then - - $JAVA_HOME_21_X64/bin/java -version - - fi - - echo "JAVA_HOME_21_arm64 = $JAVA_HOME_21_arm64" - - if [ -d "$JAVA_HOME_21_arm64" ]; then - - $JAVA_HOME_21_arm64/bin/java -version - - fi From 974bfc99f64433ff8c174189b81b029efc32ddad Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 21 Mar 2024 21:48:28 +0100 Subject: [PATCH 3/4] Downgrade oracle/setup-java --- .github/workflows/deployment-jdk-ea.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deployment-jdk-ea.yml b/.github/workflows/deployment-jdk-ea.yml index 4689a2b3172..dd1a1a1281a 100644 --- a/.github/workflows/deployment-jdk-ea.yml +++ b/.github/workflows/deployment-jdk-ea.yml @@ -95,7 +95,7 @@ jobs: id: gitversion uses: gittools/actions/gitversion/execute@v1.1.1 - name: 'Set up JDK ${{ matrix.jdk }}' - uses: oracle-actions/setup-java@v1 + uses: oracle-actions/setup-java@v1.3.3 with: website: jdk.java.net release: ${{ matrix.jdk }} From ec0b50f76b347fe1be4536caae3873c17c969c2b Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 21 Mar 2024 22:04:15 +0100 Subject: [PATCH 4/4] Add checks for upload --- .github/workflows/deployment-jdk-ea.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deployment-jdk-ea.yml b/.github/workflows/deployment-jdk-ea.yml index dd1a1a1281a..b0e39c98504 100644 --- a/.github/workflows/deployment-jdk-ea.yml +++ b/.github/workflows/deployment-jdk-ea.yml @@ -193,13 +193,13 @@ jobs: echo "${{ secrets.buildJabRefPrivateKey }}" > sshkey chmod 600 sshkey - name: Upload to builds.jabref.org (Windows) - if: (matrix.os == 'windows-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') && (!startsWith(github.ref, 'refs/heads/gh-readonly-queue')) + if: (matrix.os == 'windows-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') && (github.ref == 'refs/heads/main') shell: cmd # for rsync installed by chocolatey, we need the ssh.exe delivered with that installation run: | rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/jdk-ea && rsync" -e 'C:\ProgramData\chocolatey\lib\rsync\tools\bin\ssh.exe -p 9922 -i sshkey -o StrictHostKeyChecking=no' build/distribution/ jrrsync@build-upload.jabref.org:/var/www/builds.jabref.org/www/jdk-ea/ - name: Upload to builds.jabref.org (linux, macOS) - if: (matrix.os != 'windows-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') && (!startsWith(github.ref, 'refs/heads/gh-readonly-queue')) + if: (matrix.os != 'windows-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') && (github.ref == 'refs/heads/main') shell: bash run: | rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/jdk-ea && rsync" -e 'ssh -p 9922 -i sshkey -o StrictHostKeyChecking=no' build/distribution/ jrrsync@build-upload.jabref.org:/var/www/builds.jabref.org/www/jdk-ea/