Merge release/2.1 to main

.github/workflows/build-macos.yaml

@@ -11,19 +11,22 @@ on:
     tags:
       - v*.*.*
 
+env:
+  SCCACHE_GHA_ENABLED: "true"
+  RUSTC_WRAPPER: "sccache"
+  SQLX_OFFLINE: "1"
+
 jobs:
   build-macos:
     runs-on:
       - self-hosted
       - macOS
+      - native
     env:
       APPLE_SIGNING_IDENTITY: "Apple Distribution: defguard sp. z o.o. (82GZ7KN29J)"
       APPLE_SIGNING_IDENTITY_INSTALLER: "3rd Party Mac Developer Installer: defguard sp. z o.o. (82GZ7KN29J)"
-      APPLE_PROVIDER_SHORT_NAME: "82GZ7KN29J"
-      APPLE_ID: "kamil@defguard.net"
-      APPLE_TEAM_ID: "82GZ7KN29J"
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           submodules: recursive
 
@@ -32,42 +35,96 @@ jobs:
           VERSION=$(echo ${GITHUB_REF_NAME#v} | cut -d '-' -f1)
           echo Version: $VERSION
           echo "VERSION=$VERSION" >> ${GITHUB_ENV}
+          if [ "${GITHUB_REF_TYPE}" = "tag" ]; then
+            echo "DEFGUARD_CLIENT_BUILD_VERSION=${GITHUB_REF_NAME#v}" >> ${GITHUB_ENV}
+          fi
 
       - uses: actions/setup-node@v6
         with:
-          node-version: 25
+          node-version-file: new-ui/.nvmrc
 
-      - uses: pnpm/action-setup@v5
+      - uses: pnpm/action-setup@v6
         with:
-          cache: true
-          version: 10
+          run_install: false
+          version: 11
 
-      - name: Install deps
-        run: pnpm install --frozen-lockfile
+      - name: Get pnpm store directory
+        run: |
+          STORE_PATH=$(pnpm store path --silent)
+          mkdir -p "$STORE_PATH"
+          echo "STORE_PATH=$STORE_PATH" >> ${GITHUB_ENV}
 
-      - uses: dtolnay/rust-toolchain@stable
+      - name: Restore pnpm store cache
+        uses: actions/cache@v5
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: pnpm-store-${{ runner.os }}-${{ hashFiles('new-ui/pnpm-lock.yaml') }}
+          restore-keys: |
+            pnpm-store-${{ runner.os }}-
+
+      - name: Install Node dependencies for New UI
+        run: |
+          cd new-ui
+          pnpm install --no-frozen-lockfile
+
+      - name: Install Rust stable
+        uses: dtolnay/rust-toolchain@stable
         with:
           targets: aarch64-apple-darwin,x86_64-apple-darwin
 
+      - name: Run sccache-cache
+        uses: mozilla-actions/sccache-action@v0.0.10
+
+      - name: Install tauri-cli
+        run: cargo install tauri-cli --locked
+
       - name: Set build number
         run: |
-          sed -i '' "s,@BUILD_NUMBER@,${{ github.run_number }}," src-tauri/tauri.conf.json
           sed -i '' "s,@BUILD_NUMBER@,${{ github.run_number }}," swift/extension/VPNExtension.xcodeproj/project.pbxproj
+          sed -i '' "s,@BUILD_NUMBER@,${{ github.run_number }}," src-tauri/tauri.macos.conf.json
+
+      - name: Build new UI
+        run: |
+          cd new-ui
+          pnpm build
 
       - name: Unlock keychain
-        run: security -v unlock-keychain -p "${{ secrets.KEYCHAIN_PASSWORD }}" login.keychain
+        run: |
+          security unlock-keychain -p "${{ secrets.BUILD_KEYCHAIN_PASSWORD }}" build.keychain
 
       - name: Build app
-        uses: tauri-apps/tauri-action@v0
+        uses: tauri-apps/tauri-action@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          args: --target universal-apple-darwin
+          tauriScript: cargo tauri
+          args: --ignore-version-mismatches --config src-tauri/tauri.app.conf.json --target universal-apple-darwin
 
       - name: Build installation package
         run: |
-          security -v unlock-keychain -p "${{ secrets.KEYCHAIN_PASSWORD }}" login.keychain
-          xcrun productbuild --sign "${{ env.APPLE_SIGNING_IDENTITY_INSTALLER }}" --component "src-tauri/target/universal-apple-darwin/release/bundle/macos/Defguard.app" /Applications defguard-client.pkg
-          xcrun altool --upload-app --type macos --file defguard-client.pkg --apiKey ${{ secrets.APPLE_API_KEY }} --apiIssuer ${{ secrets.APPLE_API_ISSUER }}
-          # xcrun notarytool submit --wait --apple-id ${{ env.APPLE_ID }} --password ${{ secrets.NOTARYTOOL_APP_SPECIFIC_PASSWORD }} --team-id ${{ env.APPLE_TEAM_ID }} defguard-client.pkg
-          # xcrun stapler staple defguard-client.pkg
+          xcrun productbuild --keychain build.keychain \
+            --sign "${{ env.APPLE_SIGNING_IDENTITY_INSTALLER }}" \
+            --component "src-tauri/target/universal-apple-darwin/release/bundle/macos/Defguard.app" \
+            /Applications defguard-client.pkg
+          xcrun altool --api-key ${{ secrets.APPLE_API_KEY }} \
+            --api-issuer ${{ secrets.APPLE_API_ISSUER }} \
+            --upload-app --platform macos --file defguard-client.pkg --wait
+
+      - name: Upload What's New
+        env:
+          APP_ID: "6754601166"
+        run: |
+          UPLOAD_DIR=$(mktemp -d)
+          mkdir -p "${UPLOAD_DIR}/beta-${APP_ID}/upload/MACOS"
+          git log -1 --pretty='"whatsNew" = "%B";' > "${UPLOAD_DIR}/beta-${APP_ID}/upload/MACOS/en-US.txt"
+          RETRIES=0
+          until [ ${RETRIES} -gt 6 ]
+          do
+            xcrun altool --api-key ${{ secrets.APPLE_API_KEY }} --api-issuer ${{ secrets.APPLE_API_ISSUER }} \
+              --apple-id ${APP_ID} --bundle-version ${{ github.run_number }} \--bundle-short-version-string ${VERSION} \
+              --platform macos --beta-app-store-text "${UPLOAD_DIR}" --upload && break
+            echo "Waiting for app ${APP_ID} build ${{ github.run_number }} version ${VERSION}"
+            sleep 10
+            ((RETRIES++))
+          done
+          rm -f -r "${UPLOAD_DIR}"

.github/workflows/cross-platform-check.yml

@@ -0,0 +1,63 @@
+name: Cross-platform check
+
+on:
+  push:
+    branches:
+      - main
+      - dev
+      - "release/**"
+    paths-ignore:
+      - "*.md"
+      - "LICENSE"
+  pull_request:
+    branches:
+      - main
+      - dev
+      - "release/**"
+    paths-ignore:
+      - "*.md"
+      - "LICENSE"
+
+env:
+  CARGO_TERM_COLOR: always
+  SQLX_OFFLINE: "1"
+  SCCACHE_GHA_ENABLED: "true"
+  RUSTC_WRAPPER: "sccache"
+
+jobs:
+  check:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - macOS
+          - Windows
+
+    runs-on:
+      - self-hosted
+      - ${{ matrix.os }}
+
+    defaults:
+      run:
+        working-directory: ./src-tauri
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v7
+        with:
+          submodules: recursive
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Run sccache-cache
+        uses: mozilla-actions/sccache-action@v0.0.10
+
+      - name: Install protoc
+        if: matrix.os != 'Windows'
+        uses: arduino/setup-protoc@v3
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check compilation
+        run: cargo check --workspace --all-targets