Skip to content

Commit caf10aa

Browse files
authored
Merge pull request #1457 from crypto-com/dev
Internal Release 1.5.1
2 parents 4919a98 + b086898 commit caf10aa

File tree

4 files changed

+27
-16
lines changed

4 files changed

+27
-16
lines changed

.github/workflows/release.yml

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
strategy:
1616
matrix:
17-
os: [macos-latest, ubuntu-latest, windows-latest]
17+
os: [macos-12-large, ubuntu-latest, windows-latest]
1818

1919
steps:
2020
- name: setup dependencies
@@ -38,10 +38,10 @@ jobs:
3838
# Only install Snapcraft on Ubuntu
3939
if: startsWith(matrix.os, 'ubuntu')
4040

41-
# - name: Install AzureSignTool
42-
# # Only install Azure Sign Tool on Windows
43-
# if: startsWith(matrix.os, 'windows')
44-
# run: dotnet tool install --global AzureSignTool
41+
- name: Install AzureSignTool
42+
# Only install Azure Sign Tool on Windows
43+
if: startsWith(matrix.os, 'windows')
44+
run: dotnet tool install --global AzureSignTool
4545

4646
- name: Extract current branch name
4747
shell: bash
@@ -69,11 +69,12 @@ jobs:
6969
# Import Apple API key for app notarization on macOS
7070
run: |
7171
mkdir -p ~/private_keys/
72-
echo '${{ secrets.mac_api_key }}' > ~/private_keys/AuthKey_${{ secrets.mac_api_key_id }}.p8
72+
echo '${{ secrets.mac_api_key_2024 }}' > ~/private_keys/AuthKey_${{ secrets.mac_api_key_id_2024 }}.p8
7373
7474
- name: Build/release Electron app (MacOS, Ubuntu, Windows)
7575
uses: samuelmeuli/action-electron-builder@v1
7676
# if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')
77+
continue-on-error: true
7778
with:
7879

7980
build_script_name: electron:pre-build
@@ -85,20 +86,29 @@ jobs:
8586
# When a push is done to master, the action builds binaries for all OS and they are then released directly
8687
release: ${{ steps.extract_branch.outputs.branch == 'master' }}
8788

88-
mac_certs: ${{ secrets.mac_certs }}
89-
mac_certs_password: ${{ secrets.mac_certs_password }}
89+
mac_certs: ${{ secrets.mac_certs_2024 }}
90+
mac_certs_password: ${{ secrets.mac_certs_password_2024 }}
9091

9192
env:
9293
# macOS notarization API key
93-
API_KEY_ID: ${{ secrets.mac_api_key_id }}
94-
API_KEY_ISSUER_ID: ${{ secrets.mac_api_key_issuer_id }}
94+
APPLE_API_KEY: ~/private_keys/AuthKey_${{ secrets.mac_api_key_id_2024 }}.p8
95+
APPLE_API_KEY_ID: ${{ secrets.mac_api_key_id_2024 }}
96+
APPLE_API_KEY_ISSUER: ${{ secrets.mac_api_key_issuer_id_2024 }}
97+
APPLE_API_ISSUER: ${{ secrets.mac_api_key_issuer_id_2024 }}
9598
# Login to Snap Store
9699
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_TOKEN }}
97-
100+
101+
- name: Upload notarization-error.log
102+
uses: actions/upload-artifact@v2
103+
if: startsWith(matrix.os, 'macos')
104+
with:
105+
name: notarization-error.log
106+
path: /Users/runner/work/chain-desktop-wallet/chain-desktop-wallet/notarization-error.log
107+
98108
- name: Build Electron app (Windows)
99109
if: startsWith(matrix.os, 'windows')
100110
run: |
101-
yarn run electron:build
111+
yarn run electron:winbuild
102112
103113
- name: Sign built binary (Windows)
104114
if: startsWith(matrix.os, 'windows')

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v16.14.2
1+
v20.15.1

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ All notable changes to this project will be documented in this file.
55
*Unreleased*
66

77
*Released*
8-
## [v1.5.1] - 2024-07-05
8+
## [v1.5.1] - 2024-07-29
99
### Additions
10-
- Security enhancement on DApp Browser
10+
- Security enhancement
1111
- web3 library dependencies bump
1212
## [v1.5.0] - 2024-03-12
1313
### Additions

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,8 @@
273273
"pkg"
274274
],
275275
"category": "public.app-category.utilities",
276-
"darkModeSupport": true
276+
"darkModeSupport": true,
277+
"notarize": true
277278
},
278279
"linux": {
279280
"category": "Utility"

0 commit comments

Comments
 (0)