From 13114ae970f7f878bf49ad869772bedaaae3fa18 Mon Sep 17 00:00:00 2001 From: DRC Date: Wed, 7 Aug 2024 14:22:37 -0400 Subject: [PATCH] CI: Use libjpeg-turbo 2.1.x Stable pre-release --- .github/workflows/build.yml | 10 +++++----- appveyor.yml | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4cd8a3d2e..564ceb97e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,8 +10,8 @@ on: workflow_dispatch: env: - LJT_VERSION: 2.1.5.1 - LJT_GPG_KEY: https://raw.githubusercontent.com/libjpeg-turbo/repo/main/LJT-GPG-KEY + LJT_VERSION: 2.1.6 + LJT_GPG_KEY: https://raw.githubusercontent.com/libjpeg-turbo/repo/main/LJTPR-GPG-KEY jobs: linux: @@ -20,7 +20,7 @@ jobs: - name: Set global environment variables run: | echo "BRANCH=${GITHUB_BASE_REF:-${GITHUB_REF#refs/heads/}}" >$GITHUB_ENV - echo "LJT_URL=https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$LJT_VERSION" >>$GITHUB_ENV + echo "LJT_URL=https://s3.amazonaws.com/libjpeg-turbo-pr/2.1.x/linux" >>$GITHUB_ENV - name: Check out code uses: actions/checkout@v4 - name: Set up build @@ -72,7 +72,7 @@ jobs: - name: Set global environment variables run: | echo "BRANCH=${GITHUB_BASE_REF:-${GITHUB_REF#refs/heads/}}" >$GITHUB_ENV - echo "LJT_URL=https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$LJT_VERSION" >>$GITHUB_ENV + echo "LJT_URL=https://s3.amazonaws.com/libjpeg-turbo-pr/2.1.x/linux" >>$GITHUB_ENV - name: Check out code uses: actions/checkout@v4 - name: Set up build @@ -99,7 +99,7 @@ jobs: - name: Set global environment variables run: | echo "BRANCH=${GITHUB_BASE_REF:-${GITHUB_REF#refs/heads/}}" >$GITHUB_ENV - echo "LJT_URL=https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$LJT_VERSION" >>$GITHUB_ENV + echo "LJT_URL=https://s3.amazonaws.com/libjpeg-turbo-pr/2.1.x/macos" >>$GITHUB_ENV - name: Check out code uses: actions/checkout@v4 - name: Set up build diff --git a/appveyor.yml b/appveyor.yml index 988641845..d3f71a12a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ environment: - LJT_VERSION: 2.1.5.1 - LJT_64BIT_SDK: "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LJT_VERSION%/libjpeg-turbo-%LJT_VERSION%-vc64.exe" - LJT_32BIT_SDK: "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LJT_VERSION%/libjpeg-turbo-%LJT_VERSION%-vc.exe" + LJT_VERSION: 2.1.6 + LJT_64BIT_SDK: "https://s3.amazonaws.com/libjpeg-turbo-pr/2.1.x/windows/libjpeg-turbo-%LJT_VERSION%-vc64.exe" + LJT_32BIT_SDK: "https://s3.amazonaws.com/libjpeg-turbo-pr/2.1.x/windows/libjpeg-turbo-%LJT_VERSION%-vc.exe" install: - cmd: >-