From 7748bc5b1928c9df51b9a170d3fe22f8c386512f Mon Sep 17 00:00:00 2001 From: bunty95 <146869867+bunty95@users.noreply.github.com> Date: Wed, 2 Oct 2024 09:03:52 -0400 Subject: [PATCH] Update BuildPR.yml --- .github/workflows/BuildPR.yml | 118 +--------------------------------- 1 file changed, 1 insertion(+), 117 deletions(-) diff --git a/.github/workflows/BuildPR.yml b/.github/workflows/BuildPR.yml index d399e8ef..58f7e87e 100644 --- a/.github/workflows/BuildPR.yml +++ b/.github/workflows/BuildPR.yml @@ -3,7 +3,7 @@ name: PullRequest on: push: branches: - - master + - qt6 pull_request: jobs: @@ -39,61 +39,6 @@ jobs: run: cmake --version - name: Build project run: scripts/darwin/build.sh - - name: Codesign app bundle - if: "! github.event.pull_request.head.repo.fork " # not running on a fork - # Extract the secrets we defined earlier as environment variables - env: - MACOS_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }} - MACOS_CERTIFICATE_PWD: ${{ secrets.P12_PASSWORD }} - MACOS_CERTIFICATE_NAME: ${{ secrets.APPLE_CERTIFICATE_NAME }} - MACOS_CI_KEYCHAIN_PWD: ${{ secrets.KEYCHAIN_PASSWORD }} - run: | - # Turn our base64-encoded certificate back to a regular .p12 file - - echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12 - # We need to create a new keychain, otherwise using the certificate will prompt - # with a UI dialog asking for the certificate password, which we can't - # use in a headless CI environment - - security create-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain - security default-keychain -s build.keychain - security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain - security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign - security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_CI_KEYCHAIN_PWD" build.keychain - - # We finally codesign our app bundle, specifying the Hardened runtime option - /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents/Frameworks/* - /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents/Resources/* - /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents/PlugIns/bearer/* - /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents//PlugIns/iconengines/* - /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents/PlugIns/imageformats/* - /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents/PlugIns/platforminputcontexts/* - /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents/PlugIns/platforms/* - /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents/PlugIns/printsupport/* - /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents/PlugIns/styles/* - /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents/PlugIns/virtualkeyboard/* - /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents/MacOS/plugins/* - /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents/MacOS/dlt-commander - /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents/MacOS/dlt-viewer - /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app - - name: Notarize app bundle - if: "! github.event.pull_request.head.repo.fork " # not running on a fork - env: - PROD_MACOS_NOTARIZATION_APPLE_ID: ${{ secrets.APPLE_ID }} - PROD_MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.TEAM_ID }} - PROD_MACOS_NOTARIZATION_PWD: ${{ secrets.APP_PASSWORD }} - run: | - echo "Create keychain profile" - xcrun notarytool store-credentials "notarytool-profile" --apple-id "$PROD_MACOS_NOTARIZATION_APPLE_ID" --team-id "$PROD_MACOS_NOTARIZATION_TEAM_ID" --password "$PROD_MACOS_NOTARIZATION_PWD" - echo "Creating temp notarization archive" - ditto -c -k --keepParent "/Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app" "/Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.zip" - - echo "Notarize app" - xcrun notarytool submit "/Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.zip" --keychain-profile "notarytool-profile" --wait - - echo "Attach staple" - xcrun stapler staple "/Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app" - rm -r /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.zip - name: Artifact Creation run: | cd /Users/runner/work/dlt-viewer/dlt-viewer/build @@ -106,64 +51,3 @@ jobs: with: name: DLTViewer-${{ matrix.macos }}-${{ matrix.abi }} path: build/dist/DLTViewer*.tgz - - - buildLinux: - name: Build ${{ matrix.ubuntu }} - strategy: - matrix: - ubuntu: [ ubuntu-20.04 ] - runs-on: ${{ matrix.ubuntu }} - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - submodules: true - - name: install build environment - run: scripts/linux/install.sh - - name: Build project - run: scripts/linux/build.sh - - name: Run tests - run: ctest --test-dir build/qdlt - - name: Make artifact executable - run: chmod -R +x build/dist - - name: Archive artifact - uses: actions/upload-artifact@v4 - if: ${{ success() }} - with: - name: DLTViewer-linux-x86_64 - path: build/dist/DLTViewer*.tgz - - buildWindows: - name: Build Windows - strategy: - matrix: - task: [ sdk ] - runs-on: windows-2019 - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - submodules: true - - name: Install qt - uses: jurplel/install-qt-action@v4 - with: - version: 5.15.2 - - name: Build with CMake ${{ matrix.task }} - run: > - $env:WORKSPACE=$env:GITHUB_WORKSPACE; - $env:QTDIR=$env:Qt5_DIR.Replace('/','\'); - $env:CPACK_7Z="true"; - $env:CPACK_NSIS="true"; - ./build_sdk_windows_qt5_MSVC_cmake.bat - - name: Archive artifact - uses: actions/upload-artifact@v4 - if: ${{ success() }} - with: - name: DLTViewer-windows-x86_64 - path: | - build/dist/DLTViewer*.7z - build/dist/DLTViewer*.exe - build/dist/*.md