diff --git a/.github/workflows/README.md b/.github/workflows/README.md index b2cc58fa4a6a..45dacacd0b16 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -94,6 +94,7 @@ The GitHub workflows require a large list of secrets to deploy, notify and test 1. `CSC_LINK` - Required to be set for desktop code signing: https://www.electron.build/code-signing.html#travis-appveyor-and-other-ci-servers 1. `CSC_KEY_PASSWORD` - Required to be set for desktop code signing: https://www.electron.build/code-signing.html#travis-appveyor-and-other-ci-servers 1. `APPLE_ID` - Required for notarizing desktop code in `desktop/notarize.js` +1. `APPLE_TEAM_ID` - Required for notarizing desktop code in `desktop/notarize.js` 1. `APPLE_ID_PASSWORD` - Required for notarizing desktop code in `desktop/notarize.js` 1. `AWS_ACCESS_KEY_ID` - Required for hosting website and desktop compiled code 1. `AWS_SECRET_ACCESS_KEY` - Required for hosting website and desktop compiled code diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d90df954b216..fab1604f1ee4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -318,6 +318,7 @@ jobs: CSC_LINK: ${{ secrets.CSC_LINK }} CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} APPLE_ID: ${{ secrets.APPLE_ID }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml index b05a308c49de..d00781fa2a32 100644 --- a/.github/workflows/testBuild.yml +++ b/.github/workflows/testBuild.yml @@ -266,6 +266,7 @@ jobs: CSC_LINK: ${{ secrets.CSC_LINK }} CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} APPLE_ID: ${{ secrets.APPLE_ID }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/README.md b/README.md index a3862d391518..42d96ea06dbc 100644 --- a/README.md +++ b/README.md @@ -794,20 +794,6 @@ The commands used to compile a production or staging desktop build are `npm run HOWEVER, by default those commands will try to notarize the build (signing it as Expensify) and publish it to the S3 bucket where it's hosted for users. In most cases you won't actually need or want to do that for your local testing. To get around that and disable those behaviors for your local build, apply the following diff: ```diff -diff --git a/config/electronBuilder.config.js b/config/electronBuilder.config.js -index e4ed685f65..4c7c1b3667 100644 ---- a/config/electronBuilder.config.js -+++ b/config/electronBuilder.config.js -@@ -42,9 +42,6 @@ module.exports = { - entitlements: 'desktop/entitlements.mac.plist', - entitlementsInherit: 'desktop/entitlements.mac.plist', - type: 'distribution', -- notarize: { -- teamId: '368M544MTT', -- }, - }, - dmg: { - title: 'New Expensify', diff --git a/scripts/build-desktop.sh b/scripts/build-desktop.sh index 791f59d733..526306eec1 100755 --- a/scripts/build-desktop.sh diff --git a/config/electronBuilder.config.js b/config/electronBuilder.config.js index ad3a23407b89..5bfa9b75c463 100644 --- a/config/electronBuilder.config.js +++ b/config/electronBuilder.config.js @@ -42,9 +42,6 @@ module.exports = { entitlements: 'desktop/entitlements.mac.plist', entitlementsInherit: 'desktop/entitlements.mac.plist', type: 'distribution', - notarize: { - teamId: '368M544MTT', - }, target: [ { target: 'default', diff --git a/desktop/README.md b/desktop/README.md index d8ca7de87f0b..d04c1d845a03 100644 --- a/desktop/README.md +++ b/desktop/README.md @@ -131,7 +131,7 @@ You will need to pass your Apple ID (username) and an [app-specific password](ht Now that your credentials have been set up properly, you can push a build to Min.IO. Start by updating the version value in `package.json` to be much higher than it is currently (1.0.0-0 -> 2.0.0-0) so that the uploaded version is always higher than the version you're testing on. Then run the following, where `RootUserKey` and `RootPassKey` are the `RootUser` and `RootPass` values from step 3: ```shell -AWS_ACCESS_KEY_ID=RootUserKey AWS_SECRET_ACCESS_KEY=RootPassKey APPLE_ID=YOUR_APPLE_ID APPLE_APP_SPECIFIC_PASSWORD=YOUR_APP_SPECIFIC_PW npm run desktop-build +AWS_ACCESS_KEY_ID=RootUserKey AWS_SECRET_ACCESS_KEY=RootPassKey APPLE_ID=YOUR_APPLE_ID APPLE_TEAM_ID=YOUR_APPLE_TEAM_ID APPLE_APP_SPECIFIC_PASSWORD=YOUR_APP_SPECIFIC_PW npm run desktop-build ``` This command will create a build, notarize it, and push your build to the server. Note that it can take around 10 minutes for the command to complete.