From cbff9cf426c976433c02707825b302bf9a93caa1 Mon Sep 17 00:00:00 2001
From: "Michael Lund (Student)" <mclund2@asu.edu>
Date: Mon, 17 Feb 2025 13:49:10 -0700
Subject: [PATCH] trying to build

---
 .github/workflows/build.yml | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a4a8e0b..ab81964 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,17 +2,16 @@ name: Build SDT2
 on:
   push:
     tags:
-      - '*'
+      - "*"
 
 jobs:
   build:
     strategy:
       matrix:
-        # os: [windows-latest, macos-13, ubuntu-latest]
-        # include:
-        #   - os: ubuntu-latest
-        #     arch: x64
-        os: [macos-13]
+        os: [windows-latest, macos-latest, ubuntu-latest]
+        include:
+          - os: ubuntu-latest
+            arch: x64
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -20,7 +19,7 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: "3.11"
 
       - name: Install virtualenv
         run: pip install virtualenv
@@ -35,23 +34,20 @@ jobs:
         run: bun run init
 
       - name: macOS - Build
-        if: matrix.os == 'macos-13'
+        if: matrix.os == 'macos-latest'
         run: |
           source venv-pywebview/bin/activate
           bun run build
-
       - name: Linux - Build
         if: matrix.os == 'ubuntu-latest'
         run: |
           source venv-pywebview/bin/activate
           bun run build
-
       - name: Windows - Build
         if: matrix.os == 'windows-latest'
         run: |
           venv-pywebview\\Scripts\\activate
           bun run build
-
       - name: Windows - Sign artifact
         if: matrix.os == 'windows-latest'
         uses: azure/trusted-signing-action@v0.4.0
@@ -62,34 +58,30 @@ jobs:
           endpoint: ${{ secrets.AZURE_ENDPOINT }}
           trusted-signing-account-name: ${{ secrets.AZURE_CODE_SIGNING_NAME }}
           certificate-profile-name: ${{ secrets.AZURE_CERT_PROFILE_NAME }}
-          files-folder: 'build//app.dist'
+          files-folder: "build//app.dist"
           files-folder-filter: exe
           file-digest: SHA256
           timestamp-rfc3161: http://timestamp.acs.microsoft.com
           timestamp-digest: SHA256
 
       - name: macOS - Sign artifact
-        if: matrix.os == 'macos-13'
+        if: matrix.os == 'macos-latest'
         run: |
           echo ${{ secrets.MACOS_CERTIFICATE }} | base64 --decode > certificate.p12
-
           security create-keychain -p "${{ secrets.MACOS_CI_KEYCHAIN_PWD }}" build.keychain
           security default-keychain -s build.keychain
           security unlock-keychain -p "${{ secrets.MACOS_CI_KEYCHAIN_PWD }}" build.keychain
           security import certificate.p12 -k build.keychain -P "${{ secrets.MACOS_CERTIFICATE_PWD }}" -T /usr/bin/codesign
           security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "${{ secrets.MACOS_CI_KEYCHAIN_PWD }}" build.keychain
-
           /usr/bin/codesign -f -o runtime --timestamp -s "${{ secrets.MACOS_CERTIFICATE_NAME }}" --deep ./build/SDT2.app
           /usr/bin/codesign -vvv ./build/SDT2.app
-
       - name: macOS - Notarize artifact
-        if: matrix.os == 'macos-13'
+        if: matrix.os == 'macos-latest'
         run: |
           ditto -c -k --keepParent "build/SDT2.app" "build/SDT2.app.zip"
           xcrun notarytool store-credentials "notarytool-profile" --apple-id "${{ secrets.MACOS_NOTARIZATION_APPLE_ID }}" --team-id "${{ secrets.MACOS_NOTARIZATION_TEAM_ID }}" --password "${{ secrets.MACOS_NOTARIZATION_PWD }}" > /dev/null
           xcrun notarytool submit "build/SDT2.app.zip" --keychain-profile "notarytool-profile" --wait
           xcrun stapler staple "./build/SDT2.app"
-
       - name: Ubuntu - Prepare artifact
         if: matrix.os == 'ubuntu-latest' || (matrix.os == 'ubuntu-22.04' && matrix.arch == 'arm64')
         run: chmod +x build/SDT2 && tar -czvf build/SDT2.tar.gz -C build SDT2
@@ -98,11 +90,10 @@ jobs:
         if: ${{ matrix.os == 'windows-latest' }}
         run: |
           powershell Compress-Archive -Path build\\app.dist\\* -DestinationPath SDT2.zip
-
       - uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.os }}-build-output
           path: |
             ${{ matrix.os == 'windows-latest' && 'SDT2.zip' || '' }}
-            ${{ matrix.os == 'macos-13' && 'build/SDT2.app.zip' || '' }}
+            ${{ matrix.os == 'macos-latest' && 'build/SDT2.app.zip' || '' }}
             ${{ (matrix.os == 'ubuntu-latest' || (matrix.os == 'ubuntu-22.04' && matrix.arch == 'arm64')) && 'build/SDT2.tar.gz' || '' }}