Skip to content

Commit 071c757

Browse files
committed
feat: use argon2 0.40.1
1 parent 1909e29 commit 071c757

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

.github/workflows/build-cli.yml

+4-18
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,9 @@ jobs:
139139
env:
140140
_PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
141141
_NODE_VERSION: ${{ needs.setup.outputs.node_version }}
142-
# The only known way to get arm64 argon2 is to build it from sources
143-
npm_config_arch: arm64
144-
npm_config_build_from_source: true
145142
steps:
146143
- name: Checkout repo
147-
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
144+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
148145

149146
- name: Setup Unix Vars
150147
run: |
@@ -157,7 +154,7 @@ jobs:
157154
sudo apt install binfmt-support qemu-user-static
158155
159156
- name: Set up Node
160-
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
157+
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
161158
with:
162159
cache: 'npm'
163160
cache-dependency-path: '**/package-lock.json'
@@ -167,17 +164,6 @@ jobs:
167164
run: npm ci
168165
working-directory: ./
169166

170-
# argon2-node comes with an ELF binary for host arch, not target arch.
171-
- name: Download argon2-node binary for arm64
172-
working-directory: ./
173-
run: |
174-
ARGON2_VERSION=$(grep '"argon2":' apps/cli/package.json | sed -e 's/.*"argon2": "\(.*\)",/\1/g')
175-
echo "ARGON2_VERSION: ${ARGON2_VERSION}"
176-
curl -L -o argon2.tar.gz "https://github.com/ranisalt/node-argon2/releases/download/v${ARGON2_VERSION}/argon2-v${ARGON2_VERSION}-napi-v3-linux-arm64-glibc.tar.gz"
177-
tar xvzf argon2.tar.gz
178-
mv napi-v3/argon2.node node_modules/argon2/lib/binding/napi-v3/argon2.node
179-
rm -rf argon2.tar.gz napi-v3
180-
181167
- name: Build & Package Unix
182168
run: npm run dist:${{ env.SHORT_RUNNER_OS }}:arm64 --quiet
183169

@@ -193,14 +179,14 @@ jobs:
193179
| awk '{split($0, a); print a[1]}' > bw-${{ env.LOWER_RUNNER_OS }}-arm64-sha256-${{ env._PACKAGE_VERSION }}.txt
194180
195181
- name: Upload unix zip asset
196-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
182+
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
197183
with:
198184
name: bw-${{ env.LOWER_RUNNER_OS }}-arm64-${{ env._PACKAGE_VERSION }}.zip
199185
path: apps/cli/dist/bw-${{ env.LOWER_RUNNER_OS }}-arm64-${{ env._PACKAGE_VERSION }}.zip
200186
if-no-files-found: error
201187

202188
- name: Upload unix checksum asset
203-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
189+
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
204190
with:
205191
name: bw-${{ env.LOWER_RUNNER_OS }}-arm64-sha256-${{ env._PACKAGE_VERSION }}.txt
206192
path: apps/cli/dist/bw-${{ env.LOWER_RUNNER_OS }}-arm64-sha256-${{ env._PACKAGE_VERSION }}.txt

apps/cli/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"dependencies": {
5252
"@koa/multer": "3.0.2",
5353
"@koa/router": "12.0.1",
54-
"argon2": "0.31.2",
54+
"argon2": "0.40.1",
5555
"big-integer": "1.6.51",
5656
"browser-hrtime": "1.1.8",
5757
"chalk": "4.1.2",

package-lock.json

+22-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
"@microsoft/signalr": "8.0.0",
163163
"@microsoft/signalr-protocol-msgpack": "8.0.0",
164164
"@ng-select/ng-select": "11.2.0",
165-
"argon2": "0.31.2",
165+
"argon2": "0.40.1",
166166
"argon2-browser": "1.18.0",
167167
"big-integer": "1.6.51",
168168
"bootstrap": "4.6.0",

0 commit comments

Comments
 (0)