Merge pull request #3648 from planetarium/release/90.0.24

Release/90.0.24 into main
planetarium · Nov 21, 2023 · 4b08459 · 4b08459
2 parents 073df94 + c55d3b9
commit 4b08459
Show file tree

Hide file tree

Showing 1,666 changed files with 546,956 additions and 83,669 deletions.
diff --git a/.github/workflows/android-build-and-release.yml b/.github/workflows/android-build-and-release.yml
@@ -27,6 +27,10 @@ on:
         required: false
         default: false
 
+concurrency: 
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+  cancel-in-progress: true
+
 env:
   UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
   UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -115,7 +119,7 @@ jobs:
 
       - name: Convert AAB to APKS
         run: |
-          sudo java -jar /tmp/bundletool-all-*.jar build-apks --bundle="/tmp/player/Android/NineChronicles.aab" --output="/tmp/player/Android/result.apks" --ks="/tmp/9c-signing-keystore.keystore" --ks-pass=file:/tmp/keystore.pwd --ks-key-alias=$(cat /tmp/keyalias.name) --key-pass=file:/tmp/keyalias.pwd --mode=universal --local-testing
+          sudo java -jar /tmp/bundletool-all-*.jar build-apks --bundle="/tmp/player/Android/Nine Chronicles M.aab" --output="/tmp/player/Android/result.apks" --ks="/tmp/9c-signing-keystore.keystore" --ks-pass=file:/tmp/keystore.pwd --ks-key-alias=$(cat /tmp/keyalias.name) --key-pass=file:/tmp/keyalias.pwd --mode=universal --local-testing
 
       - name: Pack
         run: |
@@ -168,7 +172,7 @@ jobs:
       GOOGLE_PLAY_KEY_FILE: ${{ secrets.GOOGLE_PLAY_KEY_FILE }}
       GOOGLE_PLAY_KEY_FILE_PATH:
         ${{ format('{0}/fastlane/google-fastlane.json', github.workspace) }}
-      ANDROID_BUILD_FILE_PATH: ${{ format('{0}/build/Android/NineChronicles.aab', github.workspace) }}
+      ANDROID_BUILD_FILE_PATH: ${{ format('{0}/build/Android/Nine Chronicles M.aab', github.workspace) }}
       ANDROID_PACKAGE_NAME: ${{ secrets.ANDROID_PACKAGE_NAME }}
     steps:
       - name: Checkout Repository

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,6 +13,10 @@ on:
   workflow_dispatch:
     inputs:
 
+concurrency: 
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+  cancel-in-progress: true
+
 permissions:
     id-token: write
     contents: read

diff --git a/.gitignore b/.gitignore
@@ -86,9 +86,6 @@ nekoyume/compose/results
 
 # Genesis Block
 /nekoyume/Assets/StreamingAssets/genesis-block*
-/nekoyume/Assets/StreamingAssets/genesis-block-dev*
-!/nekoyume/Assets/StreamingAssets/genesis-block-9c-main
-# Shared project
 shared/bin/*
 
 # Installer Output