diff --git a/.github/build-native-debian.sh b/.github/build-native-debian.sh index 9cf66e3b..bba74279 100755 --- a/.github/build-native-debian.sh +++ b/.github/build-native-debian.sh @@ -5,13 +5,18 @@ set -ex cd "$(dirname "$(dirname "$0")")" # Add stretch for Java 8 -cat < /etc/apt/sources.list.d/stretch.list -deb http://deb.debian.org/debian stretch main -deb http://security.debian.org/debian-security stretch/updates main -END +#cat < /etc/apt/sources.list.d/stretch.list +#deb http://deb.debian.org/debian stretch main +#deb http://security.debian.org/debian-security stretch/updates main +#END + +apt install -y wget apt-transport-https gpg +wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor | tee /etc/apt/trusted.gpg.d/adoptium.gpg > /dev/null +echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list apt-get update -y -apt-get install -y --no-install-recommends openjdk-8-jdk-headless make gcc libc6-dev texinfo +apt install temurin-8-jdk +apt-get install -y --no-install-recommends make gcc libc6-dev texinfo # Needs to be split, otherwise a newer version of OpenJDK is pulled apt-get install -y --no-install-recommends ant rm archive/* diff --git a/.github/workflows/native-linux.yml b/.github/workflows/native-linux.yml index d83bc6a9..689e30cf 100644 --- a/.github/workflows/native-linux.yml +++ b/.github/workflows/native-linux.yml @@ -48,9 +48,9 @@ jobs: - name: Restart Docker run: sudo systemctl restart docker.service - name: Pull docker image - run: docker pull --platform $(echo ${{ matrix.arch }} | sed 's|-|/|g') debian:8 || true + run: docker pull --platform $(echo ${{ matrix.arch }} | sed 's|-|/|g') debian:12 || true - name: Build inside Docker - run: docker run --rm -v $GITHUB_WORKSPACE:/work debian:8 /work/.github/build-native-debian.sh + run: docker run --rm -v $GITHUB_WORKSPACE:/work debian:12 /work/.github/build-native-debian.sh - name: Archive built library uses: actions/upload-artifact@v2 with: