Merge remote-tracking branch 'origin/dev' into fix-arrr-note-saving

KomodoPlatform · Mar 6, 2025 · 9af4f47 · 9af4f47
2 parents 6d0871a + c073cf8
commit 9af4f47
Show file tree

Hide file tree

Showing 26 changed files with 883 additions and 565 deletions.
diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml
@@ -58,8 +58,9 @@ jobs:
         run: |
           NAME="mm2_$KDF_BUILD_TAG-linux-x86-64.zip"
           zip $NAME target/release/mm2 -j
-          mkdir $BRANCH_NAME
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Compress kdf build output
         env:
@@ -68,7 +69,8 @@ jobs:
         run: |
           NAME="kdf_$KDF_BUILD_TAG-linux-x86-64.zip"
           zip $NAME target/release/kdf -j
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -77,7 +79,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
       - name: Login to dockerhub
         if: github.event_name != 'pull_request' && github.ref == 'refs/heads/dev'
@@ -128,17 +132,18 @@ jobs:
         run: |
           NAME="mm2_$KDF_BUILD_TAG-mac-x86-64.zip"
           zip $NAME target/x86_64-apple-darwin/release/mm2 -j
-          mkdir $BRANCH_NAME
-          mv $NAME ./$BRANCH_NAME/
-
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
       - name: Compress kdf build output
         env:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.AVAILABLE != '' }}
         run: |
           NAME="kdf_$KDF_BUILD_TAG-mac-x86-64.zip"
           zip $NAME target/x86_64-apple-darwin/release/kdf -j
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -147,7 +152,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
   mac-arm64:
     timeout-minutes: 60
@@ -186,8 +193,9 @@ jobs:
         run: |
           NAME="mm2_$KDF_BUILD_TAG-mac-arm64.zip"
           zip $NAME target/aarch64-apple-darwin/release/mm2 -j
-          mkdir $BRANCH_NAME
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Compress kdf build output
         env:
@@ -196,7 +204,8 @@ jobs:
         run: |
           NAME="kdf_$KDF_BUILD_TAG-mac-arm64.zip"
           zip $NAME target/aarch64-apple-darwin/release/kdf -j
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -205,7 +214,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
   win-x86-64:
     timeout-minutes: 60
@@ -243,8 +254,9 @@ jobs:
         run: |
           $NAME="mm2_$Env:KDF_BUILD_TAG-win-x86-64.zip"
           7z a $NAME .\target\release\mm2.exe .\target\release\*.dll
-          mkdir $Env:BRANCH_NAME
-          mv $NAME ./$Env:BRANCH_NAME/
+          $SAFE_DIR_NAME = $Env:BRANCH_NAME -replace '/', '-'
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Compress kdf build output
         env:
@@ -253,7 +265,8 @@ jobs:
         run: |
           $NAME="kdf_$Env:KDF_BUILD_TAG-win-x86-64.zip"
           7z a $NAME .\target\release\kdf.exe .\target\release\*.dll
-          mv $NAME ./$Env:BRANCH_NAME/
+          $SAFE_DIR_NAME = $Env:BRANCH_NAME -replace '/', '-'
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -262,7 +275,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          $SAFE_BRANCH_NAME = $Env:BRANCH_NAME -replace '/', '-'
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
   mac-dylib-x86-64:
     timeout-minutes: 60
@@ -302,8 +317,9 @@ jobs:
           NAME="mm2_$KDF_BUILD_TAG-mac-dylib-x86-64.zip"
           cp target/x86_64-apple-darwin/release/libkdflib.a target/x86_64-apple-darwin/release/libmm2.a
           zip $NAME target/x86_64-apple-darwin/release/libmm2.a -j
-          mkdir $BRANCH_NAME
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Compress kdf build output
         env:
@@ -313,7 +329,8 @@ jobs:
           NAME="kdf_$KDF_BUILD_TAG-mac-dylib-x86-64.zip"
           mv target/x86_64-apple-darwin/release/libkdflib.a target/x86_64-apple-darwin/release/libkdf.a
           zip $NAME target/x86_64-apple-darwin/release/libkdf.a -j
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -322,7 +339,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
   wasm:
     timeout-minutes: 60
@@ -374,8 +393,9 @@ jobs:
         run: |
           NAME="kdf_$KDF_BUILD_TAG-wasm.zip"
           (cd ./target/target-wasm-release && zip -r - .) > $NAME
-          mkdir $BRANCH_NAME
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -384,7 +404,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
   ios-aarch64:
     timeout-minutes: 60
@@ -424,8 +446,9 @@ jobs:
           NAME="mm2_$KDF_BUILD_TAG-ios-aarch64.zip"
           cp target/aarch64-apple-ios/release/libkdflib.a target/aarch64-apple-ios/release/libmm2.a
           zip $NAME target/aarch64-apple-ios/release/libmm2.a -j
-          mkdir $BRANCH_NAME
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Compress kdf build output
         env:
@@ -435,7 +458,8 @@ jobs:
           NAME="kdf_$KDF_BUILD_TAG-ios-aarch64.zip"
           mv target/aarch64-apple-ios/release/libkdflib.a target/aarch64-apple-ios/release/libkdf.a
           zip $NAME target/aarch64-apple-ios/release/libkdf.a -j
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -444,7 +468,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
   android-aarch64:
     timeout-minutes: 60
@@ -498,8 +524,9 @@ jobs:
           NAME="mm2_$KDF_BUILD_TAG-android-aarch64.zip"
           cp target/aarch64-linux-android/release/libkdflib.a target/aarch64-linux-android/release/libmm2.a
           zip $NAME target/aarch64-linux-android/release/libmm2.a -j
-          mkdir $BRANCH_NAME
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Compress kdf build output
         env:
@@ -509,7 +536,8 @@ jobs:
           NAME="kdf_$KDF_BUILD_TAG-android-aarch64.zip"
           mv target/aarch64-linux-android/release/libkdflib.a target/aarch64-linux-android/release/libkdf.a
           zip $NAME target/aarch64-linux-android/release/libkdf.a -j
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -518,7 +546,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
   android-armv7:
     timeout-minutes: 60
@@ -572,8 +602,9 @@ jobs:
           NAME="mm2_$KDF_BUILD_TAG-android-armv7.zip"
           cp target/armv7-linux-androideabi/release/libkdflib.a target/armv7-linux-androideabi/release/libmm2.a
           zip $NAME target/armv7-linux-androideabi/release/libmm2.a -j
-          mkdir $BRANCH_NAME
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Compress kdf build output
         env:
@@ -583,7 +614,8 @@ jobs:
           NAME="kdf_$KDF_BUILD_TAG-android-armv7.zip"
           mv target/armv7-linux-androideabi/release/libkdflib.a target/armv7-linux-androideabi/release/libkdf.a
           zip $NAME target/armv7-linux-androideabi/release/libkdf.a -j
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -592,7 +624,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
   deployment-commitment:
     if: github.event_name != 'pull_request' && github.ref == 'refs/heads/dev'