Merge branch 'develop'

75ff9e28 · wind2009 · 0ed3e4c4 · e5da6da0 · 75ff9e28 · 75ff9e28
Commit 75ff9e28 authored Feb 08, 2024 by wind2009
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

.ci/assets-locale.sh .ci/assets-locale.sh +2 -1

.gitlab-ci.yml .gitlab-ci.yml +2 -2

ocgcore ocgcore +1 -1

script script +1 -1

No files found.
--- a/.ci/assets-locale.sh
+++ b/.ci/assets-locale.sh
@@ -7,4 +7,5 @@ git clone --depth=1 https://code.mycard.moe/mycard/ygopro-database
 cp -rf ./ygopro-database/locales/$TARGET_LOCALE/* .
 # ygopro-images
 mkdir pics
-wget -O - https://cdn01.moecube.com/images/ygopro-images-${TARGET_LOCALE}.zip | bsdtar -C pics -xf -
+# skip it in develop branch
+# wget -O - https://cdn01.moecube.com/images/ygopro-images-${TARGET_LOCALE}.zip | bsdtar -C pics -xf -
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -494,7 +494,7 @@ upload:
    - linux
  variables:
    appVersion: $CI_COMMIT_TAG
-  script: ./.ci/upload-packager.sh
-  # script: 'true'
+  # script: ./.ci/upload-packager.sh
+  script: 'true'
  only:
    - tags
--- a/ocgcore @ 9f708498
+++ b/ocgcore @ 9f708498
-Subproject commit 14ebfd50151aef5e13a7feba3e5badf0392eecaf
+Subproject commit 9f70849892d54adc0246e21cbe33ed2b2bde04f7
--- a/script @ 48f98d04
+++ b/script @ 48f98d04
-Subproject commit 546bd713e3cf7a6ad396a086079e303ef032665c
+Subproject commit 48f98d0469d586b5435b9eeb0cf2298c57e027b6