chore: update website deploy triggers & apple signing

zidoro · Nov 19, 2023 · 5bcdc13 · 5bcdc13
1 parent 476b232
commit 5bcdc13
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/.github/workflows/build-tauri.yml b/.github/workflows/build-tauri.yml
@@ -63,13 +63,25 @@ jobs:
       - name: Install NPM Packages
         run: |
           yarn install --immutable --network-timeout 120000
+      - name: Prepare for app notarization
+        if: startsWith(matrix.os[0], 'macos')
+        # Import Apple API key for app notarization on macOS
+        run: |
+          mkdir -p ~/private_keys/
+          echo '${{ secrets.APPLE_API_KEY_FILE }}' > ~/private_keys/AuthKey_${{ secrets.APPLE_API_KEY }}.p8
       - name: Build
         shell: bash
         run: |
           for target in ${{ join(matrix.tauri_target, ' ') }}; do
             yarn build:tauri --target $target --config ./app/tauri/release.conf.json
           done
         env:
+          APPLE_API_ISSUER: $${{ secrets.APPLE_API_ISSUER }}
+          APPLE_API_KEY_PATH: ~/private_keys/AuthKey_${{ secrets.APPLE_API_KEY }}.p8
+          APPLE_API_KEY: $${{ secrets.APPLE_API_KEY }}
+          APPLE_CERTIFICATE: $${{ secrets.APPLE_CERTIFICATE }}
+          APPLE_CERTIFICATE_PASSWORD: $${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+          APPLE_SIGNING_IDENTITY: $${{ secrets.APPLE_SIGNING_IDENTITY }}
           TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
       # Possibly set up some basic unit testing just to make sure parts render and none of the libraries are straight up breaking

diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -63,6 +63,12 @@ jobs:
         uses: benc-uk/workflow-dispatch@v1
         with:
           workflow: Deploy Website
+  update-website:
+    name: "Update Website"
+    needs: publish
+    if: needs.release-please.outputs.release_created
+    uses: ./.github/workflows/website-deploy.yml
+    secrets: inherit
   publish-to-homebrew-cask:
     name: Publish to Homebrew Cask
     needs:

diff --git a/.github/workflows/website-deploy.yml b/.github/workflows/website-deploy.yml
@@ -1,10 +1,6 @@
 name: Deploy Website
 on:
-  push:
-    branches:
-      - master
-    paths:
-      - "website"
+  workflow_call:
   workflow_dispatch:
 jobs:
   deploy:

diff --git a/app/tauri/Cargo.lock b/app/tauri/Cargo.lock
diff --git a/app/tauri/Cargo.toml b/app/tauri/Cargo.toml
@@ -3,7 +3,7 @@ name = "pomatez"
 # In the current version of release please, unless the toml file is in the root of the project it cannot be updated.
 # https://github.com/googleapis/release-please/issues/1724
 # util/cargo-version-updater.js will run to keep this value up to date before rust builds.
-version = "1.4.3"
+version = "1.5.0"
 description = "Attractive pomodoro timer for Windows, Mac, and Linux."
 authors = ["Roldan Montilla Jr"]
 license = "MIT"