Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix deployment #5585

Merged
merged 2 commits into from
May 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
REACT_APP_MAPBOX_ACCESS_TOKEN=
APPLE_TEAM_ID=
3 changes: 1 addition & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
"PRODUCTION": true,
"LISK_DOMAIN": true,
"REACT_APP_DEFAULT_NETWORK": true,
"REACT_APP_MAPBOX_ACCESS_TOKEN": true,
"APPLE_TEAM_ID": true
"REACT_APP_MAPBOX_ACCESS_TOKEN": true
},
"env": {
"es2020": true,
Expand Down
19 changes: 8 additions & 11 deletions .github/workflows/electron-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,16 @@ jobs:
run: |
aws s3 sync s3://lisk-desktop-files/fonts ./setup/react/assets/fonts/

- name: Update package.json
if: startsWith(matrix.os, 'macos')
run: |
jq '.build.mac.notarize.teamId = "${{ secrets.APPLE_TEAM_ID }}"' package.json > package_temp.json
mv package_temp.json package.json

- name: Install cpx
if: startsWith(matrix.os, 'desktop-build')
run: npm install -g cpx

- name: Prepare for app notarization
if: startsWith(matrix.os, 'macos')
# Import Apple API key for app notarization on macOS
run: |
mkdir -p ~/private_keys/
echo "${{ secrets.api_key_new }}" > ~/private_keys/AuthKey_${{ secrets.api_key_id_new }}.p8

- name: Build and pack windows app
if: startsWith(matrix.os, 'desktop-build')
# codesigning
Expand All @@ -76,10 +75,8 @@ jobs:
github_token: ${{ secrets.github_token }}
env:
# macOS for notarization API key
API_KEY: ${{ secrets.api_key_new }}
API_KEY_ID: ${{ secrets.api_key_id_new }}
API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }}
APPLE_TEAM_ID: ${{ secrets.apple_team_id }}
APPLE_ID: ${{ secrets.APPLE_ID }}
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}

- name: Output Notarization Error Log
if: failure() && startsWith(matrix.os, 'macos')
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"entitlements": "build/entitlements.plist",
"entitlementsInherit": "build/entitlements.plist",
"notarize": {
"teamId": "${APPLE_TEAM_ID}"
"teamId": ""
},
"target": {
"target": "default",
Expand Down
1 change: 0 additions & 1 deletion setup/config/webpack.config.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ const config = {
LISK_DOMAIN: '"https://lisk.com"',
REACT_APP_DEFAULT_NETWORK: `"${process.env.DEFAULT_NETWORK}"`,
REACT_APP_MAPBOX_ACCESS_TOKEN: `"${process.env.REACT_APP_MAPBOX_ACCESS_TOKEN}"`,
APPLE_TEAM_ID: `"${process.env.APPLE_TEAM_ID}"`,
}),
new StyleLintPlugin({
context: `${path.resolve(__dirname, '../../src')}`,
Expand Down
1 change: 0 additions & 1 deletion setup/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,6 @@ module.exports = {
VERSION: '',
REACT_APP_DEFAULT_NETWORK: 'undefined',
REACT_APP_MAPBOX_ACCESS_TOKEN: 'pk.eyJ1Ij',
APPLE_TEAM_ID: '',
LISK_ENABLE_DEV_TOOL: false,
LISK_DOMAIN: 'https://lisk.com',
},
Expand Down
Loading