From 729d2808acfb7ee4d216ecdb3ec0ccc845bbfb6c Mon Sep 17 00:00:00 2001 From: Paul Yushkevich Date: Tue, 8 Oct 2024 09:31:25 -0400 Subject: [PATCH] Update build.yml --- .github/workflows/build.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 467143df..61f05d64 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,12 +38,10 @@ jobs: qt_host: mac qt_arch: clang_64 test_pref: '' - codesign_cert: 'Developer ID Application: Paul Yushkevich (5A636Q488D)' - os: macos-14 qt_host: mac qt_arch: clang_64 test_pref: '' - codesign_cert: 'Developer ID Application: Paul Yushkevich (5A636Q488D)' - os: windows-2022 qt_host: windows qt_arch: win64_msvc2019_64 @@ -202,7 +200,7 @@ jobs: # Configure ITK-SNAP - name: Configure ITK-SNAP uses: threeal/cmake-action@v2.0.0 - continue-on-error: true + continue-on-error: false with: source-dir: ${{github.workspace}}/itksnap build-dir: ${{github.workspace}}/itksnap/build @@ -217,7 +215,7 @@ jobs: SITE=github-runner-${{ matrix.os }} ${{ runner.os == 'Windows' && format('CURL_LIBRARY={0}/vcpkg/installed/x64-windows-release/lib/libcurl.lib', github.workspace) || '' }} ${{ runner.os == 'Windows' && format('CURL_INCLUDE_DIR={0}/vcpkg/installed/x64-windows-release/include', github.workspace) || '' }} - ${{ runner.os == 'MacOS' && format('SNAP_MACOSX_CODESIGN_CERT={0}', matrix.codesign_cert) || '' }} + ${{ runner.os == 'MacOS' && 'SNAP_MACOSX_CODESIGN_CERT=my_itksnap_cert' || '' }} # Build ITK-SNAP using CDash - name: Build and Test ITK-SNAP @@ -256,7 +254,7 @@ jobs: security create-keychain -p "" build.keychain security default-keychain -s build.keychain security unlock-keychain -p "" build.keychain - security import Utilities/MacOS/apple_developer_for_github.p12 -k build.keychain -P "$CODESIGN_P12_KEY" -T /usr/bin/codesign + security import Utilities/MacOS/apple_developer_for_github.p12 -k build.keychain -P "$CODESIGN_P12_KEY" -T /usr/bin/codesign -l my_itksnap_cert security set-key-partition-list -S apple-tool:,apple: -s -k "" build.keychain - name: Setup tmate session @@ -265,10 +263,11 @@ jobs: # Package ITK-SNAP - name: Package ITK-SNAP - continue-on-error: true + continue-on-error: false working-directory: ${{github.workspace}}/itksnap/build + shell: bash run: | - ninja package + cmake --build . --target package # Extract the filename of ITK-SNAP package - name: Read package name