Skip to content

Commit a9d1b6b

Browse files
shamardyshamardy
committed
Merge remote-tracking branch 'origin/dev' into refactor-address-to-string-conversion
2 parents e7015ab + 9716a52 commit a9d1b6b

16 files changed

+655
-233
lines changed

‎.github/workflows/dev-build.yml

+70-36
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,9 @@ jobs:
5858
run: |
5959
NAME="mm2_$KDF_BUILD_TAG-linux-x86-64.zip"
6060
zip $NAME target/release/mm2 -j
61-
mkdir $BRANCH_NAME
62-
mv $NAME ./$BRANCH_NAME/
61+
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
62+
mkdir $SAFE_DIR_NAME
63+
mv $NAME ./$SAFE_DIR_NAME/
6364
6465
- name: Compress kdf build output
6566
env:
@@ -68,7 +69,8 @@ jobs:
6869
run: |
6970
NAME="kdf_$KDF_BUILD_TAG-linux-x86-64.zip"
7071
zip $NAME target/release/kdf -j
71-
mv $NAME ./$BRANCH_NAME/
72+
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
73+
mv $NAME ./$SAFE_DIR_NAME/
7274
7375
- name: Upload build artifact
7476
env:
@@ -77,7 +79,9 @@ jobs:
7779
FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
7880
FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
7981
if: ${{ env.FILE_SERVER_KEY != '' }}
80-
run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
82+
run: |
83+
SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
84+
python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
8185
8286
- name: Login to dockerhub
8387
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/dev'
@@ -128,17 +132,18 @@ jobs:
128132
run: |
129133
NAME="mm2_$KDF_BUILD_TAG-mac-x86-64.zip"
130134
zip $NAME target/x86_64-apple-darwin/release/mm2 -j
131-
mkdir $BRANCH_NAME
132-
mv $NAME ./$BRANCH_NAME/
133-
135+
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
136+
mkdir $SAFE_DIR_NAME
137+
mv $NAME ./$SAFE_DIR_NAME/
134138
- name: Compress kdf build output
135139
env:
136140
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
137141
if: ${{ env.AVAILABLE != '' }}
138142
run: |
139143
NAME="kdf_$KDF_BUILD_TAG-mac-x86-64.zip"
140144
zip $NAME target/x86_64-apple-darwin/release/kdf -j
141-
mv $NAME ./$BRANCH_NAME/
145+
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
146+
mv $NAME ./$SAFE_DIR_NAME/
142147
143148
- name: Upload build artifact
144149
env:
@@ -147,7 +152,9 @@ jobs:
147152
FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
148153
FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
149154
if: ${{ env.FILE_SERVER_KEY != '' }}
150-
run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
155+
run: |
156+
SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
157+
python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
151158
152159
mac-arm64:
153160
timeout-minutes: 60
@@ -186,8 +193,9 @@ jobs:
186193
run: |
187194
NAME="mm2_$KDF_BUILD_TAG-mac-arm64.zip"
188195
zip $NAME target/aarch64-apple-darwin/release/mm2 -j
189-
mkdir $BRANCH_NAME
190-
mv $NAME ./$BRANCH_NAME/
196+
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
197+
mkdir $SAFE_DIR_NAME
198+
mv $NAME ./$SAFE_DIR_NAME/
191199
192200
- name: Compress kdf build output
193201
env:
@@ -196,7 +204,8 @@ jobs:
196204
run: |
197205
NAME="kdf_$KDF_BUILD_TAG-mac-arm64.zip"
198206
zip $NAME target/aarch64-apple-darwin/release/kdf -j
199-
mv $NAME ./$BRANCH_NAME/
207+
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
208+
mv $NAME ./$SAFE_DIR_NAME/
200209
201210
- name: Upload build artifact
202211
env:
@@ -205,7 +214,9 @@ jobs:
205214
FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
206215
FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
207216
if: ${{ env.FILE_SERVER_KEY != '' }}
208-
run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
217+
run: |
218+
SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
219+
python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
209220
210221
win-x86-64:
211222
timeout-minutes: 60
@@ -243,8 +254,9 @@ jobs:
243254
run: |
244255
$NAME="mm2_$Env:KDF_BUILD_TAG-win-x86-64.zip"
245256
7z a $NAME .\target\release\mm2.exe .\target\release\*.dll
246-
mkdir $Env:BRANCH_NAME
247-
mv $NAME ./$Env:BRANCH_NAME/
257+
$SAFE_DIR_NAME = $Env:BRANCH_NAME -replace '/', '-'
258+
mkdir $SAFE_DIR_NAME
259+
mv $NAME ./$SAFE_DIR_NAME/
248260
249261
- name: Compress kdf build output
250262
env:
@@ -253,7 +265,8 @@ jobs:
253265
run: |
254266
$NAME="kdf_$Env:KDF_BUILD_TAG-win-x86-64.zip"
255267
7z a $NAME .\target\release\kdf.exe .\target\release\*.dll
256-
mv $NAME ./$Env:BRANCH_NAME/
268+
$SAFE_DIR_NAME = $Env:BRANCH_NAME -replace '/', '-'
269+
mv $NAME ./$SAFE_DIR_NAME/
257270
258271
- name: Upload build artifact
259272
env:
@@ -262,7 +275,9 @@ jobs:
262275
FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
263276
FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
264277
if: ${{ env.FILE_SERVER_KEY != '' }}
265-
run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
278+
run: |
279+
$SAFE_BRANCH_NAME = $Env:BRANCH_NAME -replace '/', '-'
280+
python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
266281
267282
mac-dylib-x86-64:
268283
timeout-minutes: 60
@@ -302,8 +317,9 @@ jobs:
302317
NAME="mm2_$KDF_BUILD_TAG-mac-dylib-x86-64.zip"
303318
cp target/x86_64-apple-darwin/release/libkdflib.a target/x86_64-apple-darwin/release/libmm2.a
304319
zip $NAME target/x86_64-apple-darwin/release/libmm2.a -j
305-
mkdir $BRANCH_NAME
306-
mv $NAME ./$BRANCH_NAME/
320+
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
321+
mkdir $SAFE_DIR_NAME
322+
mv $NAME ./$SAFE_DIR_NAME/
307323
308324
- name: Compress kdf build output
309325
env:
@@ -313,7 +329,8 @@ jobs:
313329
NAME="kdf_$KDF_BUILD_TAG-mac-dylib-x86-64.zip"
314330
mv target/x86_64-apple-darwin/release/libkdflib.a target/x86_64-apple-darwin/release/libkdf.a
315331
zip $NAME target/x86_64-apple-darwin/release/libkdf.a -j
316-
mv $NAME ./$BRANCH_NAME/
332+
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
333+
mv $NAME ./$SAFE_DIR_NAME/
317334
318335
- name: Upload build artifact
319336
env:
@@ -322,7 +339,9 @@ jobs:
322339
FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
323340
FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
324341
if: ${{ env.FILE_SERVER_KEY != '' }}
325-
run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
342+
run: |
343+
SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
344+
python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
326345
327346
wasm:
328347
timeout-minutes: 60
@@ -374,8 +393,9 @@ jobs:
374393
run: |
375394
NAME="kdf_$KDF_BUILD_TAG-wasm.zip"
376395
(cd ./target/target-wasm-release && zip -r - .) > $NAME
377-
mkdir $BRANCH_NAME
378-
mv $NAME ./$BRANCH_NAME/
396+
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
397+
mkdir $SAFE_DIR_NAME
398+
mv $NAME ./$SAFE_DIR_NAME/
379399
380400
- name: Upload build artifact
381401
env:
@@ -384,7 +404,9 @@ jobs:
384404
FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
385405
FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
386406
if: ${{ env.FILE_SERVER_KEY != '' }}
387-
run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
407+
run: |
408+
SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
409+
python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
388410
389411
ios-aarch64:
390412
timeout-minutes: 60
@@ -424,8 +446,9 @@ jobs:
424446
NAME="mm2_$KDF_BUILD_TAG-ios-aarch64.zip"
425447
cp target/aarch64-apple-ios/release/libkdflib.a target/aarch64-apple-ios/release/libmm2.a
426448
zip $NAME target/aarch64-apple-ios/release/libmm2.a -j
427-
mkdir $BRANCH_NAME
428-
mv $NAME ./$BRANCH_NAME/
449+
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
450+
mkdir $SAFE_DIR_NAME
451+
mv $NAME ./$SAFE_DIR_NAME/
429452
430453
- name: Compress kdf build output
431454
env:
@@ -435,7 +458,8 @@ jobs:
435458
NAME="kdf_$KDF_BUILD_TAG-ios-aarch64.zip"
436459
mv target/aarch64-apple-ios/release/libkdflib.a target/aarch64-apple-ios/release/libkdf.a
437460
zip $NAME target/aarch64-apple-ios/release/libkdf.a -j
438-
mv $NAME ./$BRANCH_NAME/
461+
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
462+
mv $NAME ./$SAFE_DIR_NAME/
439463
440464
- name: Upload build artifact
441465
env:
@@ -444,7 +468,9 @@ jobs:
444468
FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
445469
FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
446470
if: ${{ env.FILE_SERVER_KEY != '' }}
447-
run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
471+
run: |
472+
SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
473+
python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
448474
449475
android-aarch64:
450476
timeout-minutes: 60
@@ -498,8 +524,9 @@ jobs:
498524
NAME="mm2_$KDF_BUILD_TAG-android-aarch64.zip"
499525
cp target/aarch64-linux-android/release/libkdflib.a target/aarch64-linux-android/release/libmm2.a
500526
zip $NAME target/aarch64-linux-android/release/libmm2.a -j
501-
mkdir $BRANCH_NAME
502-
mv $NAME ./$BRANCH_NAME/
527+
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
528+
mkdir $SAFE_DIR_NAME
529+
mv $NAME ./$SAFE_DIR_NAME/
503530
504531
- name: Compress kdf build output
505532
env:
@@ -509,7 +536,8 @@ jobs:
509536
NAME="kdf_$KDF_BUILD_TAG-android-aarch64.zip"
510537
mv target/aarch64-linux-android/release/libkdflib.a target/aarch64-linux-android/release/libkdf.a
511538
zip $NAME target/aarch64-linux-android/release/libkdf.a -j
512-
mv $NAME ./$BRANCH_NAME/
539+
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
540+
mv $NAME ./$SAFE_DIR_NAME/
513541
514542
- name: Upload build artifact
515543
env:
@@ -518,7 +546,9 @@ jobs:
518546
FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
519547
FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
520548
if: ${{ env.FILE_SERVER_KEY != '' }}
521-
run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
549+
run: |
550+
SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
551+
python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
522552
523553
android-armv7:
524554
timeout-minutes: 60
@@ -572,8 +602,9 @@ jobs:
572602
NAME="mm2_$KDF_BUILD_TAG-android-armv7.zip"
573603
cp target/armv7-linux-androideabi/release/libkdflib.a target/armv7-linux-androideabi/release/libmm2.a
574604
zip $NAME target/armv7-linux-androideabi/release/libmm2.a -j
575-
mkdir $BRANCH_NAME
576-
mv $NAME ./$BRANCH_NAME/
605+
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
606+
mkdir $SAFE_DIR_NAME
607+
mv $NAME ./$SAFE_DIR_NAME/
577608
578609
- name: Compress kdf build output
579610
env:
@@ -583,7 +614,8 @@ jobs:
583614
NAME="kdf_$KDF_BUILD_TAG-android-armv7.zip"
584615
mv target/armv7-linux-androideabi/release/libkdflib.a target/armv7-linux-androideabi/release/libkdf.a
585616
zip $NAME target/armv7-linux-androideabi/release/libkdf.a -j
586-
mv $NAME ./$BRANCH_NAME/
617+
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
618+
mv $NAME ./$SAFE_DIR_NAME/
587619
588620
- name: Upload build artifact
589621
env:
@@ -592,7 +624,9 @@ jobs:
592624
FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
593625
FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
594626
if: ${{ env.FILE_SERVER_KEY != '' }}
595-
run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
627+
run: |
628+
SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
629+
python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
596630
597631
deployment-commitment:
598632
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/dev'

0 commit comments

Comments
 (0)