diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9ee17c0c..2ac4b301 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -199,7 +199,7 @@ jobs: - name: package binary (Windows) if: matrix.os == 'windows-latest' env: - GLVIS_EXPORT_NAME: glvis-${{ github.ref_name }}-${{ runner.os }}-amd64 + GLVIS_EXPORT_NAME: glvis-${{ github.ref_name }}-${{ runner.os }}-${{ runner.arch }} run: | cd glvis/build Copy-Item -Path "Release" -Destination "${Env:GLVIS_EXPORT_NAME}" -Recurse @@ -207,7 +207,7 @@ jobs: - name: package binary (Mac) if: matrix.os == 'macos-latest' env: - GLVIS_EXPORT_NAME: glvis-${{ github.ref_name }}-${{ runner.os }}-amd64 + GLVIS_EXPORT_NAME: glvis-${{ github.ref_name }}-${{ runner.os }}-${{ runner.arch }} run: | cd glvis/build make app @@ -222,12 +222,14 @@ jobs: mkdir dmg_tmp cp -a ../install-${{ matrix.os }}/GLVis.app dmg_tmp/GLVis.app # Create DMG since actions/upload-artifact will clobber Unix permissions - hdiutil create -volname "GLVis macOS x86_64" -srcfolder dmg_tmp -ov -format UDZO GLVis.dmg + hdiutil create -volname "GLVis macOS arm64" -srcfolder dmg_tmp -ov -format UDZO GLVis.dmg mkdir ${GLVIS_EXPORT_NAME} cp GLVis.dmg ${GLVIS_EXPORT_NAME} - name: upload binary uses: actions/upload-artifact@v4 + env: + GLVIS_EXPORT_NAME: glvis-${{ github.ref_name }}-${{ runner.os }}-${{ runner.arch }} with: - name: glvis-${{ github.ref_name }}-${{ runner.os }}-amd64 - path: glvis/build/glvis-${{ github.ref_name }}-${{ runner.os }}-amd64 + name: ${{ env.GLVIS_EXPORT_NAME }} + path: glvis/build/${{ env.GLVIS_EXPORT_NAME }} diff --git a/CHANGELOG b/CHANGELOG index 1b6eaba9..8c33a2fc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -9,6 +9,12 @@ https://glvis.org +Version 4.3.1 (development) +=========================== + +- Fix the Mac binary build in GitHub CI. + + Version 4.3 released on Aug 7, 2024 =================================== diff --git a/CMakeLists.txt b/CMakeLists.txt index f4624ae8..c99c29bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -345,6 +345,14 @@ if(NOT EMSCRIPTEN) install(CODE [[ include (BundleUtilities) fixup_bundle("${CMAKE_INSTALL_PREFIX}/GLVis.app" "" "") + file(GLOB LIBS_TO_SIGN + "${CMAKE_INSTALL_PREFIX}/GLVis.app/Contents/Frameworks/*.dylib") + foreach(LIB ${LIBS_TO_SIGN}) + if (NOT IS_SYMLINK ${LIB}) + execute_process(COMMAND codesign --force --sign - ${LIB}) + endif() + endforeach() + execute_process(COMMAND codesign --force --sign - ${CMAKE_INSTALL_PREFIX}/GLVis.app) ]] COMPONENT RUNTIME) endif(APPLE)