mirror of
https://github.com/bitwarden/browser.git
synced 2024-11-21 11:35:34 +01:00
Upgrade to macos-13 runner (#9457)
This commit is contained in:
parent
00c305dff3
commit
107ac5dc38
2
.github/workflows/build-cli.yml
vendored
2
.github/workflows/build-cli.yml
vendored
@ -65,7 +65,7 @@ jobs:
|
|||||||
os:
|
os:
|
||||||
[
|
[
|
||||||
{ base: "linux", distro: "ubuntu-22.04" },
|
{ base: "linux", distro: "ubuntu-22.04" },
|
||||||
{ base: "mac", distro: "macos-11" }
|
{ base: "mac", distro: "macos-13" }
|
||||||
]
|
]
|
||||||
license_type:
|
license_type:
|
||||||
[
|
[
|
||||||
|
28
.github/workflows/build-desktop.yml
vendored
28
.github/workflows/build-desktop.yml
vendored
@ -444,10 +444,7 @@ jobs:
|
|||||||
|
|
||||||
macos-build:
|
macos-build:
|
||||||
name: MacOS Build
|
name: MacOS Build
|
||||||
# Note, this workflow is running on macOS 11 to maintain compatibility with macOS 10.15 Catalina,
|
runs-on: macos-13
|
||||||
# as the newer versions will case the native modules to be incompatible with older macOS systems
|
|
||||||
# This version should stay pinned until we drop support for macOS 10.15, or we drop the native modules
|
|
||||||
runs-on: macos-11
|
|
||||||
needs: setup
|
needs: setup
|
||||||
env:
|
env:
|
||||||
_PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
|
_PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
|
||||||
@ -605,10 +602,7 @@ jobs:
|
|||||||
|
|
||||||
macos-package-github:
|
macos-package-github:
|
||||||
name: MacOS Package GitHub Release Assets
|
name: MacOS Package GitHub Release Assets
|
||||||
# Note, this workflow is running on macOS 11 to maintain compatibility with macOS 10.15 Catalina,
|
runs-on: macos-13
|
||||||
# as the newer versions will case the native modules to be incompatible with older macOS systems
|
|
||||||
# This version should stay pinned until we drop support for macOS 10.15, or we drop the native modules
|
|
||||||
runs-on: macos-11
|
|
||||||
needs:
|
needs:
|
||||||
- browser-build
|
- browser-build
|
||||||
- macos-build
|
- macos-build
|
||||||
@ -814,10 +808,7 @@ jobs:
|
|||||||
|
|
||||||
macos-package-mas:
|
macos-package-mas:
|
||||||
name: MacOS Package Prod Release Asset
|
name: MacOS Package Prod Release Asset
|
||||||
# Note, this workflow is running on macOS 11 to maintain compatibility with macOS 10.15 Catalina,
|
runs-on: macos-13
|
||||||
# as the newer versions will case the native modules to be incompatible with older macOS systems
|
|
||||||
# This version should stay pinned until we drop support for macOS 10.15, or we drop the native modules
|
|
||||||
runs-on: macos-11
|
|
||||||
needs:
|
needs:
|
||||||
- browser-build
|
- browser-build
|
||||||
- macos-build
|
- macos-build
|
||||||
@ -1014,11 +1005,7 @@ jobs:
|
|||||||
|
|
||||||
macos-package-dev:
|
macos-package-dev:
|
||||||
name: MacOS Package Dev Release Asset
|
name: MacOS Package Dev Release Asset
|
||||||
if: false # We need to look into how code signing works for dev
|
runs-on: macos-13
|
||||||
# Note, this workflow is running on macOS 11 to maintain compatibility with macOS 10.15 Catalina,
|
|
||||||
# as the newer versions will case the native modules to be incompatible with older macOS systems
|
|
||||||
# This version should stay pinned until we drop support for macOS 10.15, or we drop the native modules
|
|
||||||
runs-on: macos-11
|
|
||||||
needs:
|
needs:
|
||||||
- browser-build
|
- browser-build
|
||||||
- macos-build
|
- macos-build
|
||||||
@ -1188,14 +1175,15 @@ jobs:
|
|||||||
APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
|
APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
|
||||||
|
|
||||||
- name: Zip masdev asset
|
- name: Zip masdev asset
|
||||||
working-directory: ./dist/mas-dev-universal
|
run: |
|
||||||
run: zip -r Bitwarden-${{ env.PACKAGE_VERSION }}-masdev-universal.zip Bitwarden.app
|
cd dist/mas-dev-universal
|
||||||
|
zip -r Bitwarden-${{ env._PACKAGE_VERSION }}-masdev-universal.zip Bitwarden.app
|
||||||
|
|
||||||
- name: Upload masdev artifact
|
- name: Upload masdev artifact
|
||||||
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
|
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
|
||||||
with:
|
with:
|
||||||
name: Bitwarden-${{ env._PACKAGE_VERSION }}-masdev-universal.zip
|
name: Bitwarden-${{ env._PACKAGE_VERSION }}-masdev-universal.zip
|
||||||
path: apps/desktop/dist/mas-universal/Bitwarden-${{ env._PACKAGE_VERSION }}-masdev-universal.zip
|
path: apps/desktop/dist/mas-dev-universal/Bitwarden-${{ env._PACKAGE_VERSION }}-masdev-universal.zip
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
|
|
||||||
|
|
||||||
|
21
.github/workflows/release-desktop-beta.yml
vendored
21
.github/workflows/release-desktop-beta.yml
vendored
@ -393,10 +393,7 @@ jobs:
|
|||||||
|
|
||||||
macos-build:
|
macos-build:
|
||||||
name: MacOS Build
|
name: MacOS Build
|
||||||
# Note, this workflow is running on macOS 11 to maintain compatibility with macOS 10.15 Catalina,
|
runs-on: macos-13
|
||||||
# as the newer versions will case the native modules to be incompatible with older macOS systems
|
|
||||||
# This version should stay pinned until we drop support for macOS 10.15, or we drop the native modules
|
|
||||||
runs-on: macos-11
|
|
||||||
needs: setup
|
needs: setup
|
||||||
env:
|
env:
|
||||||
_PACKAGE_VERSION: ${{ needs.setup.outputs.release-version }}
|
_PACKAGE_VERSION: ${{ needs.setup.outputs.release-version }}
|
||||||
@ -457,7 +454,7 @@ jobs:
|
|||||||
|
|
||||||
az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/bitwarden-desktop-key |
|
az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/bitwarden-desktop-key |
|
||||||
jq -r .value | base64 -d > $HOME/certificates/bitwarden-desktop-key.p12
|
jq -r .value | base64 -d > $HOME/certificates/bitwarden-desktop-key.p12
|
||||||
|
|
||||||
az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/appstore-app-cert |
|
az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/appstore-app-cert |
|
||||||
jq -r .value | base64 -d > $HOME/certificates/appstore-app-cert.p12
|
jq -r .value | base64 -d > $HOME/certificates/appstore-app-cert.p12
|
||||||
|
|
||||||
@ -525,10 +522,7 @@ jobs:
|
|||||||
|
|
||||||
macos-package-github:
|
macos-package-github:
|
||||||
name: MacOS Package GitHub Release Assets
|
name: MacOS Package GitHub Release Assets
|
||||||
# Note, this workflow is running on macOS 11 to maintain compatibility with macOS 10.15 Catalina,
|
runs-on: macos-13
|
||||||
# as the newer versions will case the native modules to be incompatible with older macOS systems
|
|
||||||
# This version should stay pinned until we drop support for macOS 10.15, or we drop the native modules
|
|
||||||
runs-on: macos-11
|
|
||||||
needs:
|
needs:
|
||||||
- setup
|
- setup
|
||||||
- macos-build
|
- macos-build
|
||||||
@ -596,7 +590,7 @@ jobs:
|
|||||||
|
|
||||||
az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/bitwarden-desktop-key |
|
az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/bitwarden-desktop-key |
|
||||||
jq -r .value | base64 -d > $HOME/certificates/bitwarden-desktop-key.p12
|
jq -r .value | base64 -d > $HOME/certificates/bitwarden-desktop-key.p12
|
||||||
|
|
||||||
az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/appstore-app-cert |
|
az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/appstore-app-cert |
|
||||||
jq -r .value | base64 -d > $HOME/certificates/appstore-app-cert.p12
|
jq -r .value | base64 -d > $HOME/certificates/appstore-app-cert.p12
|
||||||
|
|
||||||
@ -738,10 +732,7 @@ jobs:
|
|||||||
|
|
||||||
macos-package-mas:
|
macos-package-mas:
|
||||||
name: MacOS Package Prod Release Asset
|
name: MacOS Package Prod Release Asset
|
||||||
# Note, this workflow is running on macOS 11 to maintain compatibility with macOS 10.15 Catalina,
|
runs-on: macos-13
|
||||||
# as the newer versions will case the native modules to be incompatible with older macOS systems
|
|
||||||
# This version should stay pinned until we drop support for macOS 10.15, or we drop the native modules
|
|
||||||
runs-on: macos-11
|
|
||||||
needs:
|
needs:
|
||||||
- setup
|
- setup
|
||||||
- macos-build
|
- macos-build
|
||||||
@ -804,7 +795,7 @@ jobs:
|
|||||||
|
|
||||||
az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/bitwarden-desktop-key |
|
az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/bitwarden-desktop-key |
|
||||||
jq -r .value | base64 -d > $HOME/certificates/bitwarden-desktop-key.p12
|
jq -r .value | base64 -d > $HOME/certificates/bitwarden-desktop-key.p12
|
||||||
|
|
||||||
az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/appstore-app-cert |
|
az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/appstore-app-cert |
|
||||||
jq -r .value | base64 -d > $HOME/certificates/appstore-app-cert.p12
|
jq -r .value | base64 -d > $HOME/certificates/appstore-app-cert.p12
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user