fix: PDF presenting mode (#2880)

--------- Co-authored-by: Douglas Fabris <[email protected]> Co-authored-by: Pierre Lehnen <[email protected]> Co-authored-by: gabriellsh <[email protected]> Co-authored-by: Balázs Úr <[email protected]>
RocketChat · May 21, 2024 · ca46a14 · ca46a14
1 parent 9bbcf13
commit ca46a14
Show file tree

Hide file tree

Showing 24 changed files with 23,141 additions and 54 deletions.
diff --git a/.github/workflows/pull-request-build.yml b/.github/workflows/pull-request-build.yml
@@ -3,7 +3,7 @@ name: Build pull request artifacts
 on:
   pull_request:
     branches:
-      - main
+      - master
       - develop
 
 jobs:
@@ -54,29 +54,33 @@ jobs:
 
       - name: Build Windows Package
         if: ${{ matrix.os == 'windows-latest'}}
-        run: yarn electron-builder --x64 --win nsis publish never
+        run: yarn electron-builder --publish never --x64 --win nsis
         env:
           CSC_LINK: ${{ secrets.WIN_CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }}
 
       - name: Build MacOS Package
         if: ${{ matrix.os == 'macos-latest'}}
-        run: yarn electron-builder --mac --universal dmg publish never
+        run: |
+          sudo mdutil -a -i off
+          yarn electron-builder --publish never --mac --universal
         env:
           CSC_LINK: ${{ secrets.MAC_CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.MAC_CSC_KEY_PASSWORD }}
+          CSC_FOR_PULL_REQUEST: true
+          FORCE_NOTARIZE: true
           APPLEID: ${{ secrets.APPLEID }}
           APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
           ASC_PROVIDER: 'S6UPZG7ZR3'
 
       - name: Build Ubuntu Package
         if: ${{ matrix.os == 'ubuntu-latest'}}
-        run: yarn electron-builder --linux snap publish never
+        run: yarn electron-builder --publish never --linux snap
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.os }}
+          name: ${{ runner.os }} Artifacts
           path: |
             dist/rocketchat-*.dmg
             dist/rocketchat-*.exe

diff --git a/Desktop.provisionprofile b/Desktop.provisionprofile
diff --git a/build/notarize.js b/build/notarize.js
@@ -4,7 +4,7 @@ exports.default = function notarizing(context) {
   const { electronPlatformName, appOutDir } = context;
   if (
     electronPlatformName !== 'darwin' ||
-    process.env.IS_PULL_REQUEST !== 'false'
+    process.env.FORCE_NOTARIZE !== 'true'
   ) {
     return;
   }
@@ -18,6 +18,7 @@ exports.default = function notarizing(context) {
     }, 15000);
 
     notarize({
+      tool: 'notarytool',
       appBundleId: 'chat.rocket',
       appPath: `${appOutDir}/${appName}.app`,
       appleId: process.env.APPLEID,

diff --git a/electron-builder.json b/electron-builder.json
@@ -10,7 +10,7 @@
     "category": "public.app-category.productivity",
     "target": ["dmg", "pkg", "zip", "mas"],
     "icon": "build/icon.icns",
-    "bundleVersion": "125",
+    "bundleVersion": "126",
     "helperBundleId": "chat.rocket.electron.helper",
     "type": "distribution",
     "artifactName": "rocketchat-${version}-${os}.${ext}",
@@ -22,7 +22,7 @@
     },
     "hardenedRuntime": true,
     "gatekeeperAssess": false,
-    "provisioningProfile": "embedded.provisionprofile"
+    "provisioningProfile": "Desktop.provisionprofile"
   },
   "dmg": {
     "background": "build/background.png",

diff --git a/embedded.provisionprofile b/embedded.provisionprofile