Merge pull request 'Merge development into main (macOS CI fix)' (#41 ) from development into main

Merge pull request #41 from development into main
Merge pull request 'Fix macOS ftjam setup in Gitea Actions workflow' (#40 ) from fix/dispcal_SIGSEV into development
2026-09-05 15:59:11 +01:00 · 2026-09-05 15:59:02 +01:00 · 2026-09-05 15:58:54 +01:00
1 changed files with 8 additions and 3 deletions
@@ -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
Author	SHA1	Message	Date
gronod	931d92cddf	Merge pull request 'Merge development into main (macOS CI fix)' (#41 ) from development into main Windows x86_64 Release Build / build (push) Failing after 1m22s Details macOS x86_64 Release Build / build (push) Failing after 2m47s Details Linux x86_64 Release Build / build (push) Successful in 9m52s Details Merge pull request #41 from development into main	2026-09-05 15:59:11 +01:00
gronod	16eb647b1a	Merge pull request 'Fix macOS ftjam setup in Gitea Actions workflow' (#40 ) from fix/dispcal_SIGSEV into development Merge pull request #40 from fix/dispcal_SIGSEV into development	2026-09-05 15:59:02 +01:00
Gordon Bolton	20bce9dff4	ci(gitea): use curl, make jam0, and non-root install for macOS ftjam setup	2026-09-05 15:58:54 +01:00