feat: create composite action for desktop builds with centralized env vars

.github/actions/desktop-build/action.yml

@@ -0,0 +1,101 @@
+name: Desktop Build
+description: Build the desktop application with all required environment variables
+
+inputs:
+  target:
+    description: "Rust target triple (e.g., x86_64-unknown-linux-gnu, aarch64-apple-darwin)"
+    required: true
+  channel:
+    description: "Release channel (staging, nightly, stable)"
+    required: true
+  bundles:
+    description: "Bundle types to build (e.g., appimage,deb). Leave empty for --no-bundle"
+    required: false
+    default: ""
+  features:
+    description: "Cargo features to enable (e.g., devtools,automation)"
+    required: false
+    default: ""
+  version:
+    description: "App version"
+    required: false
+    default: "0.0.0"
+  github_token:
+    description: "GitHub token"
+    required: true
+  posthog_api_key:
+    description: "PostHog API key (required for release builds)"
+    required: true
+  sentry_dsn:
+    description: "Sentry DSN"
+    required: false
+    default: ""
+  am_api_key:
+    description: "ArgMax API key"
+    required: false
+    default: ""
+  tauri_signing_private_key:
+    description: "Tauri signing private key"
+    required: false
+    default: ""
+  tauri_signing_private_key_password:
+    description: "Tauri signing private key password"
+    required: false
+    default: ""
+  vite_supabase_url:
+    description: "Supabase URL"
+    required: false
+    default: ""
+  vite_supabase_anon_key:
+    description: "Supabase anon key"
+    required: false
+    default: ""
+  vite_pro_product_id:
+    description: "Pro product ID"
+    required: false
+    default: ""
+
+runs:
+  using: composite
+  steps:
+    - shell: bash
+      run: |
+        if [[ -z "${{ inputs.posthog_api_key }}" ]]; then
+          echo "::error::posthog_api_key is required for release builds"
+          exit 1
+        fi
+        if [[ -z "${{ inputs.version }}" || "${{ inputs.version }}" == "0.0.0" ]]; then
+          echo "::warning::version not set, using default 0.0.0"
+        fi
+
+    - shell: bash
+      run: |
+        BUNDLES_FLAG="--no-bundle"
+        if [[ -n "${{ inputs.bundles }}" ]]; then
+          BUNDLES_FLAG="--bundles ${{ inputs.bundles }}"
+        fi
+
+        FEATURES_FLAG=""
+        if [[ -n "${{ inputs.features }}" ]]; then
+          FEATURES_FLAG="--features ${{ inputs.features }}"
+        fi
+
+        TAURI_CONF_PATH="./src-tauri/tauri.conf.${{ inputs.channel }}.json"
+
+        pnpm -F desktop tauri build $BUNDLES_FLAG --target ${{ inputs.target }} --config $TAURI_CONF_PATH $FEATURES_FLAG
+      env:
+        CI: false
+        GITHUB_TOKEN: ${{ inputs.github_token }}
+        AM_API_KEY: ${{ inputs.am_api_key }}
+        POSTHOG_API_KEY: ${{ inputs.posthog_api_key }}
+        SENTRY_DSN: ${{ inputs.sentry_dsn }}
+        APP_VERSION: ${{ inputs.version }}
+        TAURI_SIGNING_PRIVATE_KEY: ${{ inputs.tauri_signing_private_key }}
+        TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ inputs.tauri_signing_private_key_password }}
+        VITE_SUPABASE_URL: ${{ inputs.vite_supabase_url }}
+        VITE_SUPABASE_ANON_KEY: ${{ inputs.vite_supabase_anon_key }}
+        VITE_APP_URL: "https://hyprnote.com"
+        VITE_AI_URL: "https://ai.hyprnote.com"
+        VITE_API_URL: "https://api.hyprnote.com"
+        VITE_PRO_PRODUCT_ID: ${{ inputs.vite_pro_product_id }}
+        VITE_APP_VERSION: ${{ inputs.version }}

.github/workflows/desktop_cd.yaml

@@ -126,35 +126,28 @@ jobs:
       #   run: cargo test -p am2
       #   env:
       #     AM_API_KEY: ${{ secrets.AM_API_KEY }}
-      - run: |
-          FEATURES_FLAG=""
-          if [[ "${{ inputs.channel }}" == "staging" ]]; then
-            FEATURES_FLAG="--features devtools"
-          fi
-          pnpm -F desktop tauri build --target ${{ matrix.target }} --config ${{ env.TAURI_CONF_PATH }} --verbose $FEATURES_FLAG
+      - uses: ./.github/actions/desktop-build
+        with:
+          target: ${{ matrix.target }}
+          channel: ${{ inputs.channel }}
+          features: ${{ inputs.channel == 'staging' && 'devtools' || '' }}
+          version: ${{ needs.compute-version.outputs.version }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          posthog_api_key: ${{ secrets.POSTHOG_API_KEY }}
+          sentry_dsn: ${{ secrets.SENTRY_DSN_HYPRNOTE_2 }}
+          am_api_key: ${{ matrix.include_am && secrets.AM_API_KEY || '' }}
+          tauri_signing_private_key: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
+          tauri_signing_private_key_password: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
+          vite_supabase_url: ${{ secrets.VITE_SUPABASE_URL }}
+          vite_supabase_anon_key: ${{ secrets.VITE_SUPABASE_ANON_KEY }}
+          vite_pro_product_id: ${{ secrets.VITE_PRO_PRODUCT_ID }}
         env:
-          # https://v2.tauri.app/reference/environment-variables/
-          CI: false
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          AM_API_KEY: ${{ matrix.include_am && secrets.AM_API_KEY || '' }}
-          POSTHOG_API_KEY: ${{ secrets.POSTHOG_API_KEY }}
-          SENTRY_DSN: ${{ secrets.SENTRY_DSN_HYPRNOTE_2 }}
-          APP_VERSION: ${{ needs.compute-version.outputs.version }}
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
           APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
           APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
           APPLE_SIGNING_IDENTITY: ${{ steps.apple-cert.outputs.cert-id }}
-          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
-          TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
-          VITE_SUPABASE_URL: ${{ secrets.VITE_SUPABASE_URL }}
-          VITE_SUPABASE_ANON_KEY: ${{ secrets.VITE_SUPABASE_ANON_KEY }}
-          VITE_APP_URL: "https://hyprnote.com"
-          VITE_AI_URL: "https://ai.hyprnote.com"
-          VITE_API_URL: "https://api.hyprnote.com"
-          VITE_PRO_PRODUCT_ID: ${{ secrets.VITE_PRO_PRODUCT_ID }}
-          VITE_APP_VERSION: ${{ needs.compute-version.outputs.version }}
       - run: |
           mkdir -p target/release/
           find target/${{ matrix.target }}/release -type f -not -path "*/\.*" -exec cp {} target/release/ \;
@@ -214,28 +207,22 @@ jobs:
       # - uses: ./.github/actions/setup_flathub
       - run: pnpm -F ui build
       # - run: ./scripts/resource.sh "./apps/desktop/${{ env.TAURI_CONF_PATH }}" "resources/libonnxruntime.so"
-      - run: |
-          FEATURES_FLAG=""
-          if [[ "${{ inputs.channel }}" == "staging" ]]; then
-            FEATURES_FLAG="--features devtools"
-          fi
-          pnpm -F desktop tauri build --bundles appimage,deb --target x86_64-unknown-linux-gnu --config ${{ env.TAURI_CONF_PATH }} --verbose $FEATURES_FLAG
-        env:
-          # https://github.com/tauri-apps/tauri-action/issues/740
-          CI: false
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          AM_API_KEY: ${{ secrets.AM_API_KEY }}
-          POSTHOG_API_KEY: ${{ secrets.POSTHOG_API_KEY }}
-          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
-          APP_VERSION: ${{ needs.compute-version.outputs.version }}
-          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
-          TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
-          VITE_SUPABASE_URL: ${{ secrets.VITE_SUPABASE_URL }}
-          VITE_SUPABASE_ANON_KEY: ${{ secrets.VITE_SUPABASE_ANON_KEY }}
-          VITE_APP_URL: "https://hyprnote.com"
-          VITE_API_URL: "https://api.hyprnote.com"
-          VITE_PRO_PRODUCT_ID: ${{ secrets.VITE_PRO_PRODUCT_ID }}
-          VITE_APP_VERSION: ${{ needs.compute-version.outputs.version }}
+      - uses: ./.github/actions/desktop-build
+        with:
+          target: x86_64-unknown-linux-gnu
+          channel: ${{ inputs.channel }}
+          bundles: appimage,deb
+          features: ${{ inputs.channel == 'staging' && 'devtools' || '' }}
+          version: ${{ needs.compute-version.outputs.version }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          posthog_api_key: ${{ secrets.POSTHOG_API_KEY }}
+          sentry_dsn: ${{ secrets.SENTRY_DSN }}
+          am_api_key: ${{ secrets.AM_API_KEY }}
+          tauri_signing_private_key: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
+          tauri_signing_private_key_password: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
+          vite_supabase_url: ${{ secrets.VITE_SUPABASE_URL }}
+          vite_supabase_anon_key: ${{ secrets.VITE_SUPABASE_ANON_KEY }}
+          vite_pro_product_id: ${{ secrets.VITE_PRO_PRODUCT_ID }}
       - run: |
           mkdir -p target/release/
           find target/x86_64-unknown-linux-gnu/release -type f -not -path "*/\.*" -exec cp {} target/release/ \;

.github/workflows/desktop_e2e.yaml

@@ -20,9 +20,14 @@ jobs:
           platform: linux
       - uses: ./.github/actions/pnpm_install
       - run: pnpm -F ui build
-      - run: pnpm -F desktop tauri build --no-bundle --target x86_64-unknown-linux-gnu --config ./src-tauri/tauri.conf.staging.json --features devtools
-        env:
-          CI: false
+      - uses: ./.github/actions/desktop-build
+        with:
+          target: x86_64-unknown-linux-gnu
+          channel: staging
+          features: devtools
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          posthog_api_key: ${{ secrets.POSTHOG_API_KEY }}
+          sentry_dsn: ${{ secrets.SENTRY_DSN }}
       - uses: ./.github/actions/desktop-e2e-linux
         with:
           channel: staging
@@ -42,9 +47,14 @@ jobs:
           platform: macos
       - uses: ./.github/actions/pnpm_install
       - run: pnpm -F ui build
-      - run: pnpm -F desktop tauri build --no-bundle --target aarch64-apple-darwin --config ./src-tauri/tauri.conf.staging.json --features devtools,automation
-        env:
-          CI: false
+      - uses: ./.github/actions/desktop-build
+        with:
+          target: aarch64-apple-darwin
+          channel: staging
+          features: devtools,automation
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          posthog_api_key: ${{ secrets.POSTHOG_API_KEY }}
+          sentry_dsn: ${{ secrets.SENTRY_DSN }}
       - uses: FedericoCarboni/setup-ffmpeg@v3
         with:
           ffmpeg-version: release