From 773e45bfa9d21d0cefb8c660258dab69eb297d4d Mon Sep 17 00:00:00 2001 From: PatTheMav Date: Mon, 9 Oct 2023 15:14:38 +0200 Subject: [PATCH] CI: Add support for dependency revisions to Linux CI builds --- .github/scripts/utils.zsh/setup_linux | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/scripts/utils.zsh/setup_linux b/.github/scripts/utils.zsh/setup_linux index 17f35340a..f03b84a7e 100644 --- a/.github/scripts/utils.zsh/setup_linux +++ b/.github/scripts/utils.zsh/setup_linux @@ -28,9 +28,9 @@ local deps_baseurl local deps_label local deps_hash -IFS=';' read -r deps_version deps_baseurl deps_label deps_hash <<< \ +IFS=';' read -r deps_version deps_baseurl deps_label deps_hash deps_revision <<< \ "$(jq -r --arg target "${target}" \ - '.dependencies["cef"] | {version, baseUrl, "label", "hash": .hashes[$target]} | join(";")' \ + '.dependencies["cef"] | {version, baseUrl, "label", "hash": .hashes[$target], "revision": .revision[$target]} | join(";")' \ ${buildspec_file})" if (( ! deps_version )) { @@ -40,7 +40,7 @@ if (( ! deps_version )) { log_group 'Setting up pre-built Chromium Embedded Framework...' pushd ${project_root}/.deps -local _filename="cef_binary_${deps_version}_${target//-/_}.tar.xz" +local _filename="cef_binary_${deps_version}_${target//-/_}${deps_revision:+"_v${deps_revision}"}.tar.xz" local _url=${deps_baseurl}/${_filename} local _target="cef_binary_${deps_version}_${target//-/_}" typeset -g CEF_VERSION=${deps_version}