Change minimumSystemVersion to only apply for MAS (#1428 )

Bump version to 1.32.1 (#1427 )
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> (cherry picked from commit 09d7376f39)
2022-03-22 13:48:35 -04:00 · 2022-03-21 14:10:17 -06:00 · 2022-03-21 13:35:32 -06:00 · 2022-03-16 10:47:07 -06:00 · 2022-03-15 09:38:04 -04:00 · 2022-03-15 09:26:51 -04:00
6 changed files with 14 additions and 10 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -8,6 +8,8 @@ on:
      - 'gh-pages'
    paths-ignore:
      - '.github/workflows/**'
+  workflow_dispatch:
+    inputs: {}

 jobs:
  cloc:
@ -57,8 +59,8 @@ jobs:
        run: |
          SAFARI_REF=master

-          if [[ "$GITHUB_REF" == "refs/heads/hotfix" ]]; then
-              SAFARI_REF=hotfix
+          if [[ "$GITHUB_REF" == "refs/heads/hotfix-rc" ]]; then
+              SAFARI_REF=hotfix-rc
          elif [[ "$GITHUB_REF" == "refs/heads/rc" ]]; then
              SAFARI_REF=rc
          fi
@ -75,7 +77,7 @@ jobs:
            echo "::set-output name=rc_branch_exists::0"
          fi

-          if [[ $(git ls-remote --heads origin hotfix) ]]; then
+          if [[ $(git ls-remote --heads origin hotfix-rc) ]]; then
            echo "::set-output name=hotfix_branch_exists::1"
          else
            echo "::set-output name=hotfix_branch_exists::0"
@ -877,7 +879,7 @@ jobs:
              && needs.setup.outputs.rc_branch_exists == 0
              && needs.setup.outputs.hotfix_branch_exists == 0)
            || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
-            || github.ref == 'refs/heads/hotfix'
+            || github.ref == 'refs/heads/hotfix-rc'
        run: npm run upload:mas


--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -25,9 +25,9 @@ jobs:
      - name: Branch check
        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
        run: |
-          if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ "$GITHUB_REF" != "refs/heads/hotfix" ]]; then
+          if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ "$GITHUB_REF" != "refs/heads/hotfix-rc" ]]; then
            echo "==================================="
-            echo "[!] Can only release from the 'rc' or 'hotfix' branches"
+            echo "[!] Can only release from the 'rc' or 'hotfix-rc' branches"
            echo "==================================="
            exit 1
          fi
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 6aae3beb76164f0f5a7953138942b7fc92f2b694
+Subproject commit 212bd70986ae1cf28f82823cb3f45fae4a8d0ce0
--- a/package.json
+++ b/package.json
@ -81,7 +81,6 @@
    "mac": {
      "electronUpdaterCompatibility": ">=0.0.1",
      "category": "public.app-category.productivity",
-      "minimumSystemVersion": "10.14",
      "darkModeSupport": true,
      "gatekeeperAssess": false,
      "hardenedRuntime": true,
@ -186,7 +185,8 @@
    "mas": {
      "entitlements": "resources/entitlements.mas.plist",
      "entitlementsInherit": "resources/entitlements.mas.inherit.plist",
-      "hardenedRuntime": false
+      "hardenedRuntime": false,
+      "minimumSystemVersion": "10.14"
    },
    "nsisWeb": {
      "oneClick": false,
--- a/resources/entitlements.mac.plist
+++ b/resources/entitlements.mac.plist
@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.security.cs.allow-jit</key>
+	<true/>
 	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
 	<true/>
 	<key>com.apple.security.cs.disable-library-validation</key>
--- a/src/package.json
+++ b/src/package.json
@ -2,7 +2,7 @@
  "name": "@bitwarden/desktop",
  "productName": "Bitwarden",
  "description": "A secure and free password manager for all of your devices.",
-  "version": "1.31.4",
+  "version": "1.32.1",
  "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
  "homepage": "https://bitwarden.com",
  "license": "GPL-3.0",
Author	SHA1	Message	Date
Oscar Hinton	d6ff48ffb9	Change minimumSystemVersion to only apply for MAS (#1428 )	2022-03-22 13:48:35 -04:00
github-actions[bot]	b10f2c0563	Bump version to 1.32.1 (#1427 ) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> (cherry picked from commit `09d7376f39`)	2022-03-21 14:10:17 -06:00
Micaiah Martin	60d3f9c122	Added manual build trigger (#1405 ) (cherry picked from commit `6d429465fb`)	2022-03-21 13:35:32 -06:00
github-actions[bot]	68f09f7401	Bump version to 1.32.0 (#1415 ) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> (cherry picked from commit `e5feda0fa6`)	2022-03-16 10:47:07 -06:00
addison	35aaa71363	Revert "Disable disk caching in stateService (#1406 )" This reverts commit `8461161ac5`.	2022-03-15 09:38:04 -04:00
Thomas Rittson	8461161ac5	Disable disk caching in stateService (#1406 ) * Disable disk caching in stateService * Turn back on caching for the renderer Co-authored-by: addison <addisonbeck1@gmail.com>	2022-03-15 09:26:51 -04:00
Matt Gibson	a9a43d5f21	Update jslib	2022-03-15 08:55:59 -04:00
Matt Gibson	762e3caed9	Add jit entitlement (#1395 ) * Add arm64 package * temporarily remove workflow ignore * Don't delete universal dist when completing arm64 * Add allow-jit entitlement * Revert "Don't delete universal dist when completing arm64" This reverts commit `b06d638345`. * Revert "temporarily remove workflow ignore" This reverts commit `8007983547`. * Revert "Add arm64 package" This reverts commit `c8359dae4d`. Co-authored-by: Hinton <oscar@oscarhinton.com> (cherry picked from commit `81457f6c05`)	2022-03-11 11:03:22 -05:00
Joseph Flinn	21f96af441	Update hotfix release branch name to hotfix-rc (#1396 ) (cherry picked from commit `f845bcf6c1`)	2022-03-09 12:52:47 -08:00