Merge branch 'master' into windows-support

Author: unsecretised

.github/workflows/merges.yml

@@ -16,11 +16,8 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
 
-      - name: Install macOS ARM64 target
-        run: rustup target add aarch64-apple-darwin
-
       - name: Check formatting
         run: cargo fmt --all --check
 
-      - name: Build for macOS ARM64
-        run: cargo build --target aarch64-apple-darwin --all-features
+      - name: Cargo check for macOS ARM64
+        run: cargo check --target aarch64-apple-darwin

.github/workflows/release.yml

@@ -1,37 +1,25 @@
 name: Build macOS Release
-
 on:
   push:
     tags:
       - "v*"
   workflow_dispatch:
-
 permissions:
   contents: write
 
 jobs:
   build-macos:
-    strategy:
-      matrix:
-        include:
-          - target: aarch64-apple-darwin
-            os: macos-14
-          - target: x86_64-apple-darwin
-            os: macos-14
-
-    runs-on: ${{ matrix.os }}
-
+    runs-on: macos-14
+    env:
+      APP_VERSION: ${{ github.ref_name }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
-          targets: ${{ matrix.target }}
-
-      - name: Install cargo-bundle
-        run: cargo install cargo-bundle
+          targets: aarch64-apple-darwin,x86_64-apple-darwin
 
       - name: Cache cargo registry
         uses: actions/cache@v4
@@ -49,31 +37,60 @@ jobs:
         uses: actions/cache@v4
         with:
           path: target
-          key: ${{ runner.os }}-${{ matrix.target }}-cargo-build-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.os }}-universal-cargo-build-${{ hashFiles('**/Cargo.lock') }}
 
-      - name: Build release binary
-        run: cargo bundle --release --target ${{ matrix.target }}
+      - name: Build macOS app (universal)
+        run: bash scripts/build-macos.sh
 
+      - name: Sign macOS app
+        env:
+          MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
+          MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }}
+          MACOS_CERTIFICATE_NAME: ${{ secrets.MACOS_CERTIFICATE_NAME }}
+          MACOS_CI_KEYCHAIN_PWD: ${{ secrets.MACOS_CI_KEYCHAIN_PWD }}
+        run: bash scripts/sign-macos.sh
+
+      - name: Package DMG
+        run: bash scripts/package-macos.sh
+        env:
+          MACOS_NOTARY_KEY_ID: ${{ secrets.MACOS_NOTARY_KEY_ID }}
+          MACOS_NOTARY_ISSUER_ID: ${{ secrets.MACOS_NOTARY_ISSUER_ID }}
+          MACOS_NOTARY_TEAM_ID: ${{ secrets.MACOS_NOTARY_TEAM_ID }}
+          MACOS_NOTARY_KEY: ${{ secrets.MACOS_NOTARY_KEY }}
+
+
+      # Homebrew-style artifact from the built .app
       - name: Create artifacts directory
         run: mkdir -p artifacts
 
-      - name: Package app bundle
+      - name: Zip universal .app for Homebrew
+        # APP_BUNDLE_PATH is set by scripts/build-macos.sh
         run: |
-          cd target/${{ matrix.target }}/release/bundle/osx
-          zip -r ../../../../../artifacts/rustcast-${{ matrix.target }}.app.zip *.app
+          if [ -z "$APP_BUNDLE_PATH" ]; then
+            echo "APP_BUNDLE_PATH not set by build-macos.sh" >&2
+            exit 1
+          fi
+          APP_NAME=$(basename "$APP_BUNDLE_PATH")
+          zip -r "artifacts/${APP_NAME%.app}-universal-macos.app.zip" "$APP_BUNDLE_PATH"
+
+      - name: Upload DMG artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: rustcast-macos-dmg
+          path: ${{ env.DMG_PATH }}
+          retention-days: 7
 
-      - name: Upload artifacts
+      - name: Upload .app zip artifact (Homebrew)
         uses: actions/upload-artifact@v4
         with:
-          name: macos-${{ matrix.target }}
+          name: macos-bundles
           path: artifacts/*.zip
           retention-days: 7
 
   create-release:
     needs: build-macos
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')
-
     steps:
       - name: Download all artifacts
         uses: actions/download-artifact@v4
@@ -83,7 +100,10 @@ jobs:
       - name: Create release
         uses: softprops/action-gh-release@v1
         with:
-          files: artifacts/**/*.zip
+          # Include both DMG and .app zip(s)
+          files: |
+            artifacts/**/*.dmg
+            artifacts/**/*.zip
           draft: false
           prerelease: false
         env:

.gitignore

@@ -1 +1,2 @@
 /target
+.DS_Store

CONTRIBUTING.md

@@ -20,3 +20,34 @@ For bug fixes, and helping people to solve their github issues: see
 1. Code must compile...
 1. A video recording / screenshot would be an added bonus in getting your pull
    request merged faster.
+
+## Codebase:
+
+```
+.
+├── bundling # Bundling related stuff, ignore for the most bit
+│   ├── entitlements.plist
+│   ├── icon.icns
+│   └── Info.plist
+├── docs # Website and documentation related stuff. If something new is added to config, then modify this as well before PR-ing
+├── Cargo.lock 
+├── Cargo.toml
+├── CONTRIBUTING.md # Contributing guidelines and codebase structure
+├── EXTENSIONS.md   # Discussions about extensions implementation
+├── LICENSE.md      # License file
+├── README.md       # Readme file
+└── src
+    ├── app
+    │   ├── apps.rs         # Logic for the "apps" / commands that rustcast can perform
+    │   ├── tile            # Logic for the tile (rustcast window)
+    │   │   ├── elm.rs      # Logic for the elm architecture of the rustcast window (New and View)
+    │   │   └── update.rs   # Logic for the updating (elm architecture update) of the rustcast window
+    │   └── tile.rs
+    ├── calculator.rs       # Calculator logic 
+    ├── commands.rs         # Logic for different commands
+    ├── clipboard.rs        # Logic for the clipboard history feature of rustcast
+    ├── config.rs           # Configuration related stuff
+    ├── macos.rs            # Macos specific config
+    ├── main.rs             # Start app
+    └── utils.rs            # Common functions that are used across files
+```