From 7706d7a12ebf23208291c7307ae58d0adb543b37 Mon Sep 17 00:00:00 2001 From: Mike Beaton Date: Wed, 1 May 2024 21:16:22 +0100 Subject: [PATCH] build-0.8.7 test --- .github/workflows/build_uncrustify.yml | 6 +++--- ci-bootstrap.sh | 2 +- clang32-bootstrap.sh | 2 +- codesign/appsign.sh | 2 +- coverity/covstrap-linux.sh | 4 ++-- coverity/covstrap.sh | 4 ++-- efibuild.sh | 10 +++++----- uncstrap/uncstrap.py | 6 +++--- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build_uncrustify.yml b/.github/workflows/build_uncrustify.yml index e405ae2..2ca0061 100644 --- a/.github/workflows/build_uncrustify.yml +++ b/.github/workflows/build_uncrustify.yml @@ -27,7 +27,7 @@ jobs: - name: CI Bootstrap run: | - src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh) && eval "$src" || exit 1 + src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/build-0.8.7/ci-bootstrap.sh) && eval "$src" || exit 1 - name: Build Uncrustify run: | @@ -56,7 +56,7 @@ jobs: - name: CI Bootstrap run: | - src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh) && eval "$src" || exit 1 + src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/build-0.8.7/ci-bootstrap.sh) && eval "$src" || exit 1 - name: Build Uncrustify run: | @@ -86,7 +86,7 @@ jobs: - name: CI Bootstrap run: | - src=$(curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh) && eval "$src" || exit 1 + src=$(curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/build-0.8.7/ci-bootstrap.sh) && eval "$src" || exit 1 - name: Build Uncrustify run: | diff --git a/ci-bootstrap.sh b/ci-bootstrap.sh index 113a522..4c8e791 100644 --- a/ci-bootstrap.sh +++ b/ci-bootstrap.sh @@ -66,7 +66,7 @@ if [ "$(unamer)" = "Darwin" ]; then if [ -n "${ACID32}" ]; then echo "OVERRIDE_PYTHON3=${DEVELOPER_DIR}/usr/bin/python3" >> "$GITHUB_ENV" export OVERRIDE_PYTHON3="${DEVELOPER_DIR}/usr/bin/python3" - src=$(curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/clang32-bootstrap.sh) && eval "$src" || exit 1 + src=$(curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/build-0.8.7/clang32-bootstrap.sh) && eval "$src" || exit 1 fi fi diff --git a/clang32-bootstrap.sh b/clang32-bootstrap.sh index 4bda6ce..b0dd12e 100755 --- a/clang32-bootstrap.sh +++ b/clang32-bootstrap.sh @@ -21,7 +21,7 @@ fi CLANG32_DIR="clang32" -CLANG32_SCRIPTS_URL="https://raw.githubusercontent.com/acidanthera/ocbuild/master/scripts/" +CLANG32_SCRIPTS_URL="https://raw.githubusercontent.com/acidanthera/ocbuild/build-0.8.7/scripts/" CLANG32_SCRIPTS=( "fix-macho32" "libtool32" diff --git a/codesign/appsign.sh b/codesign/appsign.sh index d8de39b..fc1fab4 100755 --- a/codesign/appsign.sh +++ b/codesign/appsign.sh @@ -33,7 +33,7 @@ downloadcert() { abort "Unable to find macOS certificate password" "Set MAC_CERTIFICATE_PASSWORD environment variable" fi - curl -OL "https://github.com/acidanthera/ocbuild/raw/master/codesign/certificate.p12" || abort "Failed to download certificates" + curl -OL "https://github.com/acidanthera/ocbuild/raw/build-0.8.7/codesign/certificate.p12" || abort "Failed to download certificates" local pw pw=$(uuidgen) diff --git a/coverity/covstrap-linux.sh b/coverity/covstrap-linux.sh index a3a82f0..8396a9d 100644 --- a/coverity/covstrap-linux.sh +++ b/coverity/covstrap-linux.sh @@ -12,10 +12,10 @@ # to be later used with OpenCore. # # Latest version available at: -# https://raw.githubusercontent.com/acidanthera/ocbuild/master/coverity/covstrap-linux.sh +# https://raw.githubusercontent.com/acidanthera/ocbuild/build-0.8.7/coverity/covstrap-linux.sh # # Example usage: -# src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/coverity/covstrap-linux.sh) && eval "$src" || exit 1 +# src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/build-0.8.7/coverity/covstrap-linux.sh) && eval "$src" || exit 1 # abort() { diff --git a/coverity/covstrap.sh b/coverity/covstrap.sh index 120029c..321cb2a 100644 --- a/coverity/covstrap.sh +++ b/coverity/covstrap.sh @@ -12,10 +12,10 @@ # to be later used with Acidanthera products. # # Latest version available at: -# https://raw.githubusercontent.com/acidanthera/ocbuild/master/coverity/covstrap.sh +# https://raw.githubusercontent.com/acidanthera/ocbuild/build-0.8.7/coverity/covstrap.sh # # Example usage: -# src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/coverity/covstrap.sh) && eval "$src" || exit 1 +# src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/build-0.8.7/coverity/covstrap.sh) && eval "$src" || exit 1 # abort() { diff --git a/efibuild.sh b/efibuild.sh index 21bc193..02be7af 100755 --- a/efibuild.sh +++ b/efibuild.sh @@ -191,10 +191,10 @@ if [ "$(nasm -v)" = "" ] || [ "$(nasm -v | grep Apple)" != "" ]; then fi pushd /tmp >/dev/null || exit 1 rm -rf nasm-mac64.zip - curl -OL "https://github.com/acidanthera/ocbuild/raw/master/external/nasm-mac64.zip" || exit 1 + curl -OL "https://github.com/acidanthera/ocbuild/raw/build-0.8.7/external/nasm-mac64.zip" || exit 1 nasmzip=$(cat nasm-mac64.zip) rm -rf nasm-* - curl -OL "https://github.com/acidanthera/ocbuild/raw/master/external/${nasmzip}" || exit 1 + curl -OL "https://github.com/acidanthera/ocbuild/raw/build-0.8.7/external/${nasmzip}" || exit 1 unzip -q "${nasmzip}" nasm*/nasm nasm*/ndisasm || exit 1 sudo mkdir -p /usr/local/bin || exit 1 sudo mv nasm*/nasm /usr/local/bin/ || exit 1 @@ -214,10 +214,10 @@ if [ "$(iasl -v)" = "" ]; then fi pushd /tmp >/dev/null || exit 1 rm -rf iasl-macosx.zip - curl -OL "https://github.com/acidanthera/ocbuild/raw/master/external/iasl-macosx.zip" || exit 1 + curl -OL "https://github.com/acidanthera/ocbuild/raw/build-0.8.7/external/iasl-macosx.zip" || exit 1 iaslzip=$(cat iasl-macosx.zip) rm -rf iasl - curl -OL "https://github.com/acidanthera/ocbuild/raw/master/external/${iaslzip}" || exit 1 + curl -OL "https://github.com/acidanthera/ocbuild/raw/build-0.8.7/external/${iaslzip}" || exit 1 unzip -q "${iaslzip}" iasl || exit 1 sudo mkdir -p /usr/local/bin || exit 1 sudo mv iasl /usr/local/bin/ || exit 1 @@ -388,7 +388,7 @@ fi if [ "$NEW_BUILDSYSTEM" != "1" ]; then if [ "$OFFLINE_MODE" != "1" ]; then - updaterepo "https://github.com/acidanthera/audk" UDK master || exit 1 + updaterepo "https://github.com/acidanthera/audk" UDK build-0.8.7 || exit 1 else echo "Working in offline mode. Skip UDK update" fi diff --git a/uncstrap/uncstrap.py b/uncstrap/uncstrap.py index 461f1ed..bfacb96 100755 --- a/uncstrap/uncstrap.py +++ b/uncstrap/uncstrap.py @@ -127,7 +127,7 @@ def build_uncrustify(url): def download_uncrustify_conf(): - response = requests.get('https://raw.githubusercontent.com/acidanthera/ocbuild/master/uncstrap/configs/' + UNC_CONF, timeout=5) + response = requests.get('https://raw.githubusercontent.com/acidanthera/ocbuild/build-0.8.7/uncstrap/configs/' + UNC_CONF, timeout=5) with open(UNC_CONF, 'wb') as conf: conf.write(response.content) @@ -137,10 +137,10 @@ def download_uncrustify_bin(): if os.path.isfile(zip_name): os.remove(zip_name) - response = requests.get('https://raw.githubusercontent.com/acidanthera/ocbuild/master/external/' + zip_name, timeout=5) + response = requests.get('https://raw.githubusercontent.com/acidanthera/ocbuild/build-0.8.7/external/' + zip_name, timeout=5) real_filename = response.text - response = requests.get('https://raw.githubusercontent.com/acidanthera/ocbuild/master/external/' + real_filename, timeout=5) + response = requests.get('https://raw.githubusercontent.com/acidanthera/ocbuild/build-0.8.7/external/' + real_filename, timeout=5) with open(zip_name, 'wb') as archive: archive.write(response.content)