diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml index 55771b7c2138..839df9e758b4 100644 --- a/.github/workflows/testBuild.yml +++ b/.github/workflows/testBuild.yml @@ -164,7 +164,7 @@ jobs: postGithubComment: runs-on: ubuntu-latest name: Post a GitHub comment with app download links for testing - needs: [android, ios] + needs: [android, ios, desktop] steps: - name: Checkout uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -190,11 +190,10 @@ jobs: - name: Publish links to apps for download run: | gh pr comment --body \ - "Use the links below to test this build in android and iOS. Happy testing! - | android :robot: | iOS :apple: | - | ------------- | ------------- | - | ${{fromJson(steps.set_var.outputs.android_paths).html_path}} | ${{fromJson(steps.set_var.outputs.ios_paths).html_path}} | - | ------------- | ------------- | - | ![Android](https://api.qrserver.com/v1/create-qr-code/?size=200x200&data=${{fromJson(steps.set_var.outputs.android_paths).html_path}}) | ![iOS](https://api.qrserver.com/v1/create-qr-code/?size=200x200&data=${{fromJson(steps.set_var.outputs.ios_paths).html_path}}) |" + ":test_tube::test_tube: Use the links below to test this build in android and iOS. Happy testing! :test_tube::test_tube: + | android :robot: | iOS :apple: | desktop :computer: | + | ------------- | ------------- | ------------- | + | ${{fromJson(steps.set_var.outputs.android_paths).html_path}} | ${{fromJson(steps.set_var.outputs.ios_paths).html_path}} | https://ad-hoc-expensify-cash.us-east-1.amazonaws.com/desktop/${{github.event.number}}/NewExpensify.dmg + | ![Android](https://api.qrserver.com/v1/create-qr-code/?size=200x200&data=${{fromJson(steps.set_var.outputs.android_paths).html_path}}) | ![iOS](https://api.qrserver.com/v1/create-qr-code/?size=200x200&data=${{fromJson(steps.set_var.outputs.ios_paths).html_path}}) | ![desktop](https://ad-hoc-expensify-cash.us-east-1.amazonaws.com/desktop/${{github.event.number}}/NewExpensify.dmg)" env: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} diff --git a/config/electronBuilder.config.js b/config/electronBuilder.config.js index 5abc01514537..db642e00008e 100644 --- a/config/electronBuilder.config.js +++ b/config/electronBuilder.config.js @@ -23,10 +23,6 @@ const macIcon = { internal: './desktop/icon-stg.png', }; -const isCorrectElectronEnv = ['production', 'staging', 'internal'].includes( - process.env.ELECTRON_ENV, -); - /** * The configuration for the production and staging Electron builds. * It can be used to create local builds of the same, by omitting the `--publish` flag @@ -39,9 +35,7 @@ module.exports = { }, mac: { category: 'public.app-category.finance', - icon: isCorrectElectronEnv - ? macIcon[process.env.ELECTRON_ENV] - : './desktop/icon-stg.png', + icon: macIcon[process.env.ELECTRON_ENV], hardenedRuntime: true, entitlements: 'desktop/entitlements.mac.plist', entitlementsInherit: 'desktop/entitlements.mac.plist', @@ -55,11 +49,9 @@ module.exports = { publish: [ { provider: 's3', - bucket: isCorrectElectronEnv - ? s3Bucket[process.env.ELECTRON_ENV] - : 'ad-hoc-expensify-cash', + bucket: s3Bucket[process.env.ELECTRON_ENV], channel: 'latest', - path: isCorrectElectronEnv ? s3Path[process.env.ELECTRON_ENV] : '/', + path: s3Path[process.env.ELECTRON_ENV], }, ], afterSign: isPublishing ? './desktop/notarize.js' : undefined,