From ea437dc852405570213080e565703cdd451e2e00 Mon Sep 17 00:00:00 2001 From: Benitoite Date: Tue, 22 Nov 2022 02:08:18 -0800 Subject: [PATCH 1/4] mac: use Big Sur for the autobuild The *Catalina* image is now deprecated --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1f8393e08..9bf1d1cc1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,13 +8,12 @@ on: pull_request: branches: - dev - - newlocallab release: types: - created jobs: build: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: actions/checkout@v2 - name: Install dependencies From 239dec3124bf92fe9e2d951fc7269fec89fa9040 Mon Sep 17 00:00:00 2001 From: Benitoite Date: Tue, 22 Nov 2022 02:54:06 -0800 Subject: [PATCH 2/4] mac: list a dir --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9bf1d1cc1..5d3e989d3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -64,6 +64,7 @@ jobs: -DCMAKE_RANLIB=/usr/bin/ranlib \ -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \ .. + ls /usr/local/lib zsh -c 'echo "Configured in $(printf "%0.2f" $(($[$(date +%s)-$(cat configstamp)]/$((60.))))) minutes"' - name: Compile RawTherapee run: | From 43c8544b1f0a8a1db1eb52d41ebe54cab5fe162f Mon Sep 17 00:00:00 2001 From: Benitoite Date: Tue, 22 Nov 2022 03:05:13 -0800 Subject: [PATCH 3/4] mac: brew install llvm instead of libomp --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5d3e989d3..83d8aa3a9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,7 +22,7 @@ jobs: mkdir build date +%s > build/stamp brew uninstall --ignore-dependencies libtiff - brew install libtiff gtk+3 gtkmm3 gtk-mac-integration adwaita-icon-theme libsigc++@2 little-cms2 libiptcdata fftw lensfun expat pkgconfig libomp shared-mime-info | tee -a depslog + brew install libtiff gtk+3 gtkmm3 gtk-mac-integration adwaita-icon-theme libsigc++@2 little-cms2 libiptcdata fftw lensfun expat pkgconfig llvm shared-mime-info | tee -a depslog date -u echo "----====Pourage====----" cat depslog | grep Pouring From 1a9b5cfacd137b4ad967317de0512042869d5175 Mon Sep 17 00:00:00 2001 From: Benitoite Date: Tue, 22 Nov 2022 03:17:57 -0800 Subject: [PATCH 4/4] mac: install libomp11 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 83d8aa3a9..95b46f004 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -64,7 +64,7 @@ jobs: -DCMAKE_RANLIB=/usr/bin/ranlib \ -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \ .. - ls /usr/local/lib + curl -L https://github.com/Homebrew/homebrew-core/raw/679923b4eb48a8dc7ecc1f05d06063cd79b3fc00/Formula/libomp.rb -o libomp.rb && brew install libomp.rb zsh -c 'echo "Configured in $(printf "%0.2f" $(($[$(date +%s)-$(cat configstamp)]/$((60.))))) minutes"' - name: Compile RawTherapee run: |