Merge branch 'release/1.6-alpha' of github.com:DefGuard/client into swift_plugin

Author: moubctez

.github/workflows/build-macos.yaml

@@ -1,6 +1,15 @@
 name: Build macOS app
 on:
-  workflow_call:
+  push:
+    branches:
+      - main
+      - dev
+      - "release/**"
+    paths-ignore:
+      - "*.md"
+      - "LICENSE"
+    tags:
+      - v*.*.*
 
 jobs:
   build-macos:

.github/workflows/release.yaml

@@ -3,6 +3,7 @@ on:
   push:
     tags:
       - v*.*.*
+
 jobs:
   create-release:
     name: create-release
@@ -111,7 +112,6 @@ jobs:
 
           deb-s3 upload -l --bucket=apt.defguard.net --access-key-id=${{ secrets.AWS_ACCESS_KEY_APT }} --secret-access-key=${{ secrets.AWS_SECRET_KEY_APT }} --s3-region=eu-north-1 --no-fail-if-exists --codename=bookworm --component="$COMPONENT" src-tauri/target/release/bundle/deb/defguard-client_${{ env.VERSION }}_${{ matrix.deb_arch }}.deb
 
-
   build-linux:
     needs:
       - create-release
@@ -395,11 +395,6 @@ jobs:
           cat PKGBUILD
           cat .SRCINFO
 
-  build-macos:
-    needs:
-      - create-release
-    uses: ./.github/workflows/build-macos.yml
-
   # Builds Windows MSI and uploads it as artifact
   build-windows:
     needs:
@@ -481,40 +476,3 @@ jobs:
           asset_path: defguard-client-signed.msi
           asset_name: defguard-client_${{ env.VERSION }}_x64_en-US.msi
           asset_content_type: application/octet-stream
-
-  apt-sign:
-    needs:
-      - build-linux
-      - ubuntu-22-04-build
-    runs-on:
-      - self-hosted
-      - Linux
-      - X64
-    strategy:
-      fail-fast: false
-    steps:
-      - name: Sign APT repository
-        run: |
-          export AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_APT }}
-          export AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_KEY_APT }}
-          export AWS_REGION=eu-north-1
-          sudo apt update -y
-          sudo apt install -y awscli curl jq
-
-          for DIST in trixie bookworm; do
-            aws s3 cp s3://apt.defguard.net/dists/${DIST}/Release .
-
-            curl -X POST "${{ secrets.DEFGUARD_SIGNING_URL }}?signature_type=both" \
-              -H "Authorization: Bearer ${{ secrets.DEFGUARD_SIGNING_API_KEY }}" \
-              -F "file=@Release" \
-              -o response.json
-
-            cat response.json | jq -r '.files["Release.gpg"].content' | base64 --decode > Release.gpg
-            cat response.json | jq -r '.files.Release.content' | base64 --decode > InRelease
-
-            aws s3 cp Release.gpg s3://apt.defguard.net/dists/${DIST}/ --acl public-read
-            aws s3 cp InRelease s3://apt.defguard.net/dists/${DIST}/ --acl public-read
-
-          done
-          (aws s3 ls s3://apt.defguard.net/dists/ --recursive; aws s3 ls s3://apt.defguard.net/pool/ --recursive) | awk '{print "<a href=\""$4"\">"$4"</a><br>"}' > index.html
-          aws s3 cp index.html s3://apt.defguard.net/ --acl public-read