Skip to content

Commit d02b35a

Browse files
committed
ci: mitigate infinite loop when bundling for mac-intel
1 parent 5406239 commit d02b35a

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.github/workflows/macos.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,14 @@ jobs:
5656
- name: Install dependencies for bundling
5757
run: brew install dylibbundler
5858
- name: Set artifact name
59-
run: echo "artifact_name=dune3d-${{ matrix.os }}-$(date +%Y-%m-%d-%H%M)-$(echo ${{ github.ref_name }} | tr / -)" >> $GITHUB_ENV
59+
run: echo "artifact_name=dune3d-${{ matrix.arch }}-$(date +%Y-%m-%d-%H%M)-$(echo ${{ github.ref_name }} | tr / -)" >> $GITHUB_ENV
6060
- name: Bundle app
61+
timeout-minutes: 10
6162
run: |
6263
bash scripts/bundle_macos.sh
63-
ditto -c -k --keepParent dist/Dune\ 3D.app dist/Dune3D-${{ matrix.os }}.zip
64+
ditto -c -k --keepParent dist/Dune\ 3D.app dist/Dune3D-${{ matrix.arch }}.zip
6465
- name: Upload bundle
6566
uses: actions/upload-artifact@v4
6667
with:
6768
name: ${{ env.artifact_name }}
68-
path: "dist/Dune3D-${{ matrix.os }}.zip"
69+
path: "dist/Dune3D-${{ matrix.arch }}.zip"

scripts/bundle_macos.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ do
3131
then
3232
cp "$unquoted" "$loaders_dir"
3333
echo "\"@executable_path/../Resources/lib/gdk-pixbuf-2.0/2.10.0/loaders/$(basename "$unquoted")\"" >> "$loaders_dir.cache"
34-
dylibbundler -of -b -x "$loaders_dir/$(basename "$unquoted")" -d "$lib_dir" -p @executable_path/../Resources/lib/ -s $HOMEBREW_PREFIX/lib
34+
dylibbundler -of -b -x "$loaders_dir/$(basename "$unquoted")" -d "$lib_dir" -p @executable_path/../Resources/lib/ -s $brew_prefix/lib
3535
else
3636
echo "$item" >> "$loaders_dir.cache"
3737
fi

0 commit comments

Comments
 (0)