Fuck windows

overlayeddev · Dec 3, 2023 · f1a2562 · f1a2562
1 parent 4fcfe6e
commit f1a2562
Showing 1 changed file with 32 additions and 33 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -40,21 +40,21 @@ jobs:
       fail-fast: false
       matrix:
         settings:
-          # - host: macos-latest
-          #   target: universal-apple-darwin
-          #   toolchain: aarch64-apple-darwin,x86_64-apple-darwin
-          #   bundles: app,dmg
-          #   os: darwin
+          - host: macos-latest
+            target: universal-apple-darwin
+            toolchain: aarch64-apple-darwin,x86_64-apple-darwin
+            bundles: app,dmg
+            os: darwin
           - host: windows-latest
             target: x86_64-pc-windows-msvc
             toolchain: x86_64-pc-windows-msvc
             bundles: msi,nsis
             os: windows
-          # - host: ubuntu-latest
-          #   target: x86_64-unknown-linux-gnu
-          #   toolchain: x86_64-unknown-linux-gnu
-          #   bundles: deb,appimage
-          #   os: linux
+          - host: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+            toolchain: x86_64-unknown-linux-gnu
+            bundles: deb,appimage
+            os: linux
     env:
       APP_DIR: "apps/desktop"
     runs-on: ${{ matrix.settings.host }}
@@ -130,7 +130,7 @@ jobs:
       - name: Sign Windows Binaries
         run: |
           echo "Starting code sign for windows bins..."
-          docker run -v "./binaries:/code/binaries" ghcr.io/hacksore/sslcom-codesign:latest batch_sign \
+          docker run -v "./binaries:/code/binaries" ghcr.io/sslcom/codesigner:latest batch_sign \
             -username=${ES_USERNAME} \
             -password=${ES_PASSWORD} \
             -credential_id=${ES_CREDENTIAL_ID} \
@@ -146,28 +146,27 @@ jobs:
         run: |
           ls -hal binaries/signed
           sha1sum binaries/signed/*
-          # change the perms to 777 as the signer seems to change owner to root
-          chmod -R 777 binaries/signed
-      - name: Create a nsis.zip and msi.zip
-        run: |
-          # create a signature of the binaries with tauri signer, this does not mutate the original bin
-          # TODO: waiting for tauri to support env vars via https://github.com/tauri-apps/tauri/pull/8327
-          cargo tauri signer sign --password "" --private-key "${{ secrets.TAURI_PRIVATE_KEY }}" binaries/signed/*.msi 
-          cargo tauri signer sign --password "" --private-key "${{ secrets.TAURI_PRIVATE_KEY }}" binaries/signed/*.exe
-
-          # zip the binaries using the name "Overlayed" and the version from the package.json
-          cd binaries/signed
-          zip -r "Overlayed_${{ env.PACKAGE_VERSION }}_x64_en-US.msi.zip" *.msi
-          zip -r "Overlayed_${{ env.PACKAGE_VERSION }}_x64_en-US.nsis.zip" *.exe
-
-          # debug
-          ls -hal binaries/signed
-          # TODO: patch the release json to include the new sig files content for
-          # "windows-x86_64"
-        env:
-          TAURI_PRIVATE_KEY: "${{ secrets.TAURI_PRIVATE_KEY }}"
-          TAURI_PUBLIC_KEY: "${{ secrets.TAURI_PUBLIC_KEY }}"
-
+          # change the perms to 777
+          # chmod -R 777 binaries/signed
+      # - name: Create a nsis.zip and msi.zip
+      #   run: |
+      #     # create a signature of the binaries with tauri signer, this does not mutate the original bin
+      #     cargo tauri signer sign --password "" --private-key "${{ secrets.TAURI_PRIVATE_KEY }}" binaries/signed/*.msi 
+      #     cargo tauri signer sign --password "" --private-key "${{ secrets.TAURI_PRIVATE_KEY }}" binaries/signed/*.exe
+      #
+      #     # zip the binaries using the name "Overlayed" and the version from the package.json
+      #     cd binaries/signed
+      #     zip -r "Overlayed_${{ env.PACKAGE_VERSION }}_x64_en-US.msi.zip" *.msi
+      #     zip -r "Overlayed_${{ env.PACKAGE_VERSION }}_x64_en-US.nsis.zip" *.exe
+      #
+      #     # debug
+      #     ls -hal binaries/signed
+      #     # TODO: patch the release json to include the new sig files content for
+      #     # "windows-x86_64"
+      #   env:
+      #     TAURI_PRIVATE_KEY: "${{ secrets.TAURI_PRIVATE_KEY }}"
+      #     TAURI_PUBLIC_KEY: "${{ secrets.TAURI_PUBLIC_KEY }}"
+      #
       - name: Upload signed windows binaries
         uses: actions/github-script@v7
         with: