From 20bce9dff42f36a053cbee08a8c2ec1c422c5110 Mon Sep 17 00:00:00 2001 From: Gordon Bolton Date: Sat, 5 Sep 2026 15:58:54 +0100 Subject: [PATCH] ci(gitea): use curl, make jam0, and non-root install for macOS ftjam setup --- .gitea/workflows/build-macos.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build-macos.yml b/.gitea/workflows/build-macos.yml index 0ce1c3c..3893462 100644 --- a/.gitea/workflows/build-macos.yml +++ b/.gitea/workflows/build-macos.yml @@ -16,14 +16,18 @@ jobs: - name: Install ftjam run: | - wget -q -O ftjam.tar.gz https://sourceforge.net/projects/freetype/files/ftjam/2.5.2/ftjam-2.5.2.tar.gz/download + curl -fsSL -o ftjam.tar.gz https://sourceforge.net/projects/freetype/files/ftjam/2.5.2/ftjam-2.5.2.tar.gz/download || wget --no-check-certificate -q -O ftjam.tar.gz https://sourceforge.net/projects/freetype/files/ftjam/2.5.2/ftjam-2.5.2.tar.gz/download tar -xzf ftjam.tar.gz cd ftjam-2.5.2 - make CC="cc -Wno-implicit-function-declaration -Wno-incompatible-pointer-types -Wno-int-conversion -Wno-implicit-int" - sudo cp bin.*/jam /usr/local/bin/jam + make jam0 CC="cc -Wno-implicit-function-declaration -Wno-incompatible-pointer-types -Wno-int-conversion -Wno-implicit-int" + mkdir -p "$HOME/.local/bin" + cp jam0 "$HOME/.local/bin/jam" + echo "$HOME/.local/bin" >> $GITHUB_PATH + cp jam0 /usr/local/bin/jam 2>/dev/null || true - name: Build ArgyllCMS run: | + export PATH="$HOME/.local/bin:/usr/local/bin:$PATH" export OSTYPE=darwin export MACHTYPE=x86_64-apple-darwin export HOSTTYPE=x86_64 @@ -52,6 +56,7 @@ jobs: - name: Package Release run: | + export PATH="$HOME/.local/bin:/usr/local/bin:$PATH" export OSTYPE=darwin export MACHTYPE=x86_64-apple-darwin export HOSTTYPE=x86_64 -- 2.39.5