Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-01-01 18:08:19 +01:00
Code Issues Projects Releases Wiki Activity

pull password from env

Browse Source
This commit is contained in:
Kyle Spearrin 2020-09-22 16:55:40 -04:00
parent 0dbe4bc66e
commit c5250adf53
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/scripts/macos/setup-keychain.ps1 vendored
View File

@ -11,7 +11,6 @@ security create-keychain -p $env:KEYCHAIN_PASSWORD build.keychain
security default-keychain -s build.keychain security default-keychain -s build.keychain
security unlock-keychain -p $env:KEYCHAIN_PASSWORD build.keychain security unlock-keychain -p $env:KEYCHAIN_PASSWORD build.keychain
security set-keychain-settings -lut 1200 build.keychain security set-keychain-settings -lut 1200 build.keychain
security add-generic-password -k build.keychain -a "AC_USERNAME" -w $env:APPLE_ID_PASSWORD -s "AC_PASSWORD"
security import $desktopKeyPath -k build.keychain -P $env:DESKTOP_KEY_PASSWORD -T /usr/bin/codesign -T /usr/bin/security security import $desktopKeyPath -k build.keychain -P $env:DESKTOP_KEY_PASSWORD -T /usr/bin/codesign -T /usr/bin/security
security import $devidAppCertPath -k build.keychain -P $env:DEVID_CERT_PASSWORD -T /usr/bin/codesign -T /usr/bin/security security import $devidAppCertPath -k build.keychain -P $env:DEVID_CERT_PASSWORD -T /usr/bin/codesign -T /usr/bin/security
security import $devidInstallerCertPath -k build.keychain -P $env:DEVID_CERT_PASSWORD -T /usr/bin/codesign -T /usr/bin/security security import $devidInstallerCertPath -k build.keychain -P $env:DEVID_CERT_PASSWORD -T /usr/bin/codesign -T /usr/bin/security

0
.github/secrets/bitwarden-deskop-key.p12.gpg → .github/secrets/bitwarden-desktop-key.p12.gpg vendored
View File

6
.github/workflows/build.yml vendored
View File

@ -153,6 +153,9 @@ jobs:
- name: Build application for .dmg - name: Build application for .dmg
run: npm run dist:mac run: npm run dist:mac
env:
APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
# - name: Build Safari extension for App Store # - name: Build Safari extension for App Store
# shell: pwsh # shell: pwsh
@ -160,3 +163,6 @@ jobs:
- name: Build application for App Store - name: Build application for App Store
run: npm run dist:mac:mas run: npm run dist:mac:mas
env:
APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}

9
scripts/after-sign.js
View File

@ -7,18 +7,19 @@ async function run(context) {
console.log('## After sign'); console.log('## After sign');
// console.log(context); // console.log(context);
const appleId = process.env.APPLEID;
const appName = context.packager.appInfo.productFilename;
const appPath = `${context.appOutDir}/${appName}.app`;
const macBuild = context.electronPlatformName === 'darwin'; const macBuild = context.electronPlatformName === 'darwin';
if (macBuild) { if (macBuild) {
console.log('### Notarizing ' + appPath); console.log('### Notarizing ' + appPath);
const appName = context.packager.appInfo.productFilename;
const appPath = `${context.appOutDir}/${appName}.app`;
const appleId = process.env.APPLE_ID_USERNAME || process.env.APPLEID;
const appleIdPassword = process.env.APPLE_ID_PASSWORD || `@keychain:AC_PASSWORD`;
return await notarize({ return await notarize({
appBundleId: 'com.bitwarden.desktop', appBundleId: 'com.bitwarden.desktop',
appPath: appPath, appPath: appPath,
appleId: appleId, appleId: appleId,
appleIdPassword: `@keychain:AC_PASSWORD`, appleIdPassword: appleIdPassword,
}); });
} }
} }