diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fb7ddb7..849f32e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,9 +27,13 @@ jobs: distribution: 'temurin' java-version: '21' - - name: Update Assets + - name: Update Submodules + run: | + git submodule foreach --recursive 'git pull --rebase origin main --allow-unrelated-histories' + continue-on-error: true + + - name: Pull Assets run: | - git submodule foreach --recursive 'git pull --no-rebase origin main' git clone https://${{ secrets.ACCESS_TOKEN_GITHUB }}@github.com/imas-tools/gakumas-raw-txts.git app/src/main/assets/gakumas-local/gakumas-raw-txts mv app/src/main/assets/gakumas-local/gakumas-raw-txts/Resource app/src/main/assets/gakumas-local/raw rm -rf app/src/main/assets/gakumas-local/gakumas-raw-txts diff --git a/app/src/main/assets/gakumas-local b/app/src/main/assets/gakumas-local index 56c568e..0ffe615 160000 --- a/app/src/main/assets/gakumas-local +++ b/app/src/main/assets/gakumas-local @@ -1 +1 @@ -Subproject commit 56c568e32a84ee1351f2efcc70971b7f23d85186 +Subproject commit 0ffe615be44269500cfb9fa78b967a791724535c