From 5348dcc138a11cde2269350156ca8ecda60b828f Mon Sep 17 00:00:00 2001 From: Bryan Gerlach Date: Mon, 16 Dec 2024 15:33:36 -0600 Subject: [PATCH] fix generator for master --- .github/workflows/generator-android.yml | 2 +- .github/workflows/generator-linux.yml | 3 ++- .github/workflows/generator-windows.yml | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/generator-android.yml b/.github/workflows/generator-android.yml index e9dd33b..e95b6b2 100644 --- a/.github/workflows/generator-android.yml +++ b/.github/workflows/generator-android.yml @@ -69,7 +69,7 @@ env: TAG_NAME: "${{ inputs.upload-tag }}" VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" # vcpkg version: 2024.07.12 - VCPKG_COMMIT_ID: "1de2026f28ead93ff1773e6e680387643e914ea1" + VCPKG_COMMIT_ID: "b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c" VERSION: "${{ fromJson(inputs.extras).version }}" NDK_VERSION: "r27c" #signing keys env variable checks diff --git a/.github/workflows/generator-linux.yml b/.github/workflows/generator-linux.yml index c9e8202..5855e51 100644 --- a/.github/workflows/generator-linux.yml +++ b/.github/workflows/generator-linux.yml @@ -69,7 +69,7 @@ env: TAG_NAME: "${{ inputs.upload-tag }}" VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" # vcpkg version: 2024.07.12 - VCPKG_COMMIT_ID: "1de2026f28ead93ff1773e6e680387643e914ea1" + VCPKG_COMMIT_ID: "b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c" VERSION: "${{ fromJson(inputs.extras).version }}" NDK_VERSION: "r27c" #signing keys env variable checks @@ -239,6 +239,7 @@ jobs: done exit 1 fi + head -n 100 "${VCPKG_ROOT}/buildtrees/ffmpeg/build-${{ matrix.job.vcpkg-triplet }}-rel-out.log" || true shell: bash - name: icon stuff diff --git a/.github/workflows/generator-windows.yml b/.github/workflows/generator-windows.yml index 6a3691f..6b03232 100644 --- a/.github/workflows/generator-windows.yml +++ b/.github/workflows/generator-windows.yml @@ -70,7 +70,7 @@ env: TAG_NAME: "${{ inputs.upload-tag }}" VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" # vcpkg version: 2024.07.12 - VCPKG_COMMIT_ID: "1de2026f28ead93ff1773e6e680387643e914ea1" + VCPKG_COMMIT_ID: "b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c" VERSION: "${{ fromJson(inputs.extras).version }}" NDK_VERSION: "r27c" #signing keys env variable checks @@ -306,6 +306,7 @@ jobs: done exit 1 fi + head -n 100 "${VCPKG_ROOT}/buildtrees/ffmpeg/build-${{ matrix.job.vcpkg-triplet }}-rel-out.log" || true shell: bash - name: icon stuff