From 570d37f15ec9ad9fd5c9e841daf743ca6b96019d Mon Sep 17 00:00:00 2001 From: RoiArthurB Date: Fri, 23 Feb 2024 01:36:57 +0700 Subject: [PATCH] [JDK] Move back to 17.0.8.1+1 ci release --- .github/workflows/travis-packaging-linux.yaml | 2 +- .github/workflows/trigger-gama-release.yaml | 1 + travis/zip_withjdk.sh | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/travis-packaging-linux.yaml b/.github/workflows/travis-packaging-linux.yaml index 86225ecff1..0d75160f85 100644 --- a/.github/workflows/travis-packaging-linux.yaml +++ b/.github/workflows/travis-packaging-linux.yaml @@ -54,7 +54,7 @@ jobs: dpkg --build ${{ github.workspace }}/${{ matrix.zipName }} dpkg --info ${{ github.workspace }}/${{ matrix.zipName }}.deb - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: gama-linux-deb path: | diff --git a/.github/workflows/trigger-gama-release.yaml b/.github/workflows/trigger-gama-release.yaml index 3b4a938d55..14a5266ed3 100644 --- a/.github/workflows/trigger-gama-release.yaml +++ b/.github/workflows/trigger-gama-release.yaml @@ -40,6 +40,7 @@ jobs: run: | chmod +x ${{ github.workspace }}/travis/* mv ${{ github.workspace }}/gama.product/extraresources ${{ github.workspace }}/travis + mv ${{ github.workspace }}/gama.product/extraresources ${{ github.workspace }}/LICENSE commit=$(git rev-parse --short=7 HEAD) echo "commit=$commit" >> "$GITHUB_OUTPUT" diff --git a/travis/zip_withjdk.sh b/travis/zip_withjdk.sh index 629c8609cf..67fe047308 100644 --- a/travis/zip_withjdk.sh +++ b/travis/zip_withjdk.sh @@ -11,10 +11,10 @@ archivePath="$GITHUB_WORKSPACE/gama.application" # Download latest JDK # echo "=== Download latest JDK" -wget -q $(curl https://api.github.com/repos/adoptium/temurin17-binaries/releases/tags/jdk-17.0.10+7 | grep "/OpenJDK17U-jdk_x64_linux.*.gz\"" | cut -d ':' -f 2,3 | tr -d \") -O "jdk_linux-17.tar.gz" -wget -q $(curl https://api.github.com/repos/adoptium/temurin17-binaries/releases/tags/jdk-17.0.10+7 | grep "/OpenJDK17U-jdk_x64_window.*.zip\"" | cut -d ':' -f 2,3 | tr -d \") -O "jdk_win32-17.zip" -wget -q $(curl https://api.github.com/repos/adoptium/temurin17-binaries/releases/tags/jdk-17.0.10+7 | grep "/OpenJDK17U-jdk_x64_mac.*.gz\"" | cut -d ':' -f 2,3 | tr -d \") -O "jdk_macosx-17.tar.gz" -wget -q $(curl https://api.github.com/repos/adoptium/temurin17-binaries/releases/tags/jdk-17.0.10+7 | grep "/OpenJDK17U-jdk_aarch64_mac.*.gz\"" | cut -d ':' -f 2,3 | tr -d \") -O "jdk_macosx_aarch-17.tar.gz" +wget -q $(curl https://api.github.com/repos/adoptium/temurin17-binaries/releases/tags/jdk-17.0.8.1+1 | grep "/OpenJDK17U-jdk_x64_linux.*.gz\"" | cut -d ':' -f 2,3 | tr -d \") -O "jdk_linux-17.tar.gz" +wget -q $(curl https://api.github.com/repos/adoptium/temurin17-binaries/releases/tags/jdk-17.0.8.1+1 | grep "/OpenJDK17U-jdk_x64_window.*.zip\"" | cut -d ':' -f 2,3 | tr -d \") -O "jdk_win32-17.zip" +wget -q $(curl https://api.github.com/repos/adoptium/temurin17-binaries/releases/tags/jdk-17.0.8.1+1 | grep "/OpenJDK17U-jdk_x64_mac.*.gz\"" | cut -d ':' -f 2,3 | tr -d \") -O "jdk_macosx-17.tar.gz" +wget -q $(curl https://api.github.com/repos/adoptium/temurin17-binaries/releases/tags/jdk-17.0.8.1+1 | grep "/OpenJDK17U-jdk_aarch64_mac.*.gz\"" | cut -d ':' -f 2,3 | tr -d \") -O "jdk_macosx_aarch-17.tar.gz" # # Prepare downloaded JDK