update ci url

.ci/assets-locale.sh

@@ -3,8 +3,8 @@ set -x
 set -o errexit
 # ygopro-database
 apt update && apt -y install wget git libarchive-tools
-git clone --depth=1 https://code.mycard.moe/nanahira/ygopro-database
+git clone --depth=1 https://code.moenext.com/nanahira/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 -
+wget -O - https://cdn02.moecube.com:444/images/ygopro-images-${TARGET_LOCALE}.zip | bsdtar -C pics -xf -

.ci/libevent-prebuild.sh

@@ -8,7 +8,7 @@ if [ -d "libevent-stable" ]; then
 fi
 
 if [ ! -d "libevent-2.0.22-stable" ]; then
-  wget -O - https://cdn01.moecube.com/ygopro-build-materials/libevent-2.0.22-stable.tar.gz | tar zfx -
+  wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/libevent-2.0.22-stable.tar.gz | tar zfx -
 fi
 
 install_path="$PWD/libevent-stable"

.ci/prepare-irrlicht.sh

+#!/bin/bash
+set -x
+set -o errexit
+
+IRRLICHT_REPO_URL="https://code.moenext.com/mycard/irrlicht-new.git"
+IRRLICHT_BRANCH_NAME="master"
+
+# if $CI_COMMIT_REF_NAME includes develop or pre, then we use the develop branch
+if [[ "$CI_COMMIT_REF_NAME" == *"develop"* || "$CI_COMMIT_REF_NAME" == *".pre"* ]]; then
+  IRRLICHT_BRANCH_NAME="develop"
+fi
+
+if [ ! -d "irrlicht" ]; then
+  git clone --depth=1 --branch "$IRRLICHT_BRANCH_NAME" "$IRRLICHT_REPO_URL" irrlicht
+else
+  cd irrlicht
+  git fetch origin "$IRRLICHT_BRANCH_NAME"
+  git checkout "$IRRLICHT_BRANCH_NAME"
+  git reset --hard origin/"$IRRLICHT_BRANCH_NAME"
+  cd ..
+fi

.ci/upload-packager.sh

@@ -33,9 +33,13 @@ runForDepot() {
   echo "$result" | jq .
 }
 
-runForDepot win32 zh-CN
-runForDepot linux zh-CN
-runForDepot darwin zh-CN
-runForDepot win32 en-US
-runForDepot linux en-US
-runForDepot darwin en-US
+if [[ "$CI_COMMIT_TAG" == *".pre"* ]]; then
+  echo "This is a pre-release, skipping upload."
+else
+  runForDepot win32 zh-CN
+  runForDepot linux zh-CN
+  runForDepot darwin zh-CN
+  runForDepot win32 en-US
+  runForDepot linux en-US
+  runForDepot darwin en-US
+fi

.gitlab-ci.yml

@@ -14,13 +14,13 @@ mat_common:
     - linux
   script:
     # lua
-    - wget -O - https://cdn01.moecube.com/ygopro-build-materials/lua-5.4.4.tar.gz | tar zfx -
+    - wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/lua-5.4.4.tar.gz | tar zfx -
     - mv lua-5.4.4 lua
     # sqlite3
-    - wget -O - https://cdn01.moecube.com/ygopro-build-materials/sqlite-autoconf-3390300.tar.gz | tar zfx -
+    - wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/sqlite-autoconf-3390300.tar.gz | tar zfx -
     - mv sqlite-autoconf-3390300 sqlite3
     # freetype
-    - wget -O - https://cdn01.moecube.com/ygopro-build-materials/freetype-2.11.1.tar.gz | tar zfx -
+    - wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/freetype-2.11.1.tar.gz | tar zfx -
     - mv freetype-2.11.1 freetype
     # miniaudio
     - ./.ci/prepare-miniaudio.sh
@@ -54,7 +54,7 @@ mat_linux:
   image: git-registry.mycard.moe/mycard/docker-runner-base:debian11
   script:
     - apt update; apt -y install git wget tar
-    - git clone --depth=1 https://code.mycard.moe/mycard/irrlicht-new irrlicht
+    - ./.ci/prepare-irrlicht.sh
   artifacts:
     paths:
       - irrlicht
@@ -65,11 +65,11 @@ mat_macos:
     - linux
   script:
     - apt update; apt -y install wget tar
-    - wget -O - https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-beta5-macosx.tar.gz | tar zfx -
+    - wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/premake-5.0.0-beta5-macosx.tar.gz | tar zfx -
     - chmod +x premake5
     - mkdir irrlicht
     - cd irrlicht
-    - wget -O - https://cdn01.moecube.com/ygopro-build-materials/irrlicht-mycard-mac.tar.gz | tar zfx -
+    - wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/irrlicht-mycard-mac.tar.gz | tar zfx -
     - cd ..
   artifacts:
     paths:
@@ -83,13 +83,13 @@ mat_windows:
   script:
     - apt update; apt -y install wget tar patch p7zip-full
     # premake5.exe
-    - wget https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-beta5-windows.zip
+    - wget https://cdn02.moecube.com:444/ygopro-build-materials/premake-5.0.0-beta5-windows.zip
     - 7z x -y premake-5.0.0-beta5-windows.zip
     # event
-    - wget -O - https://cdn01.moecube.com/ygopro-build-materials/libevent-2.0.22-stable.tar.gz | tar zfx -
+    - wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/libevent-2.0.22-stable.tar.gz | tar zfx -
     - mv libevent-2.0.22-stable event
     # irrlicht
-    - git clone --depth=1 -b develop https://code.mycard.moe/mycard/irrlicht-new irrlicht
+    - ./.ci/prepare-irrlicht.sh
   artifacts:
     paths:
       - premake5.exe
@@ -229,21 +229,21 @@ assets:
   script:
     - apt update; apt -y install tar wget git
     # starter pack
-    - wget -O - https://code.mycard.moe/mycard/ygopro-starter-pack/-/archive/master/ygopro-starter-pack-master.tar.gz | tar zfx -
+    - wget -O - https://code.moenext.com/mycard/ygopro-starter-pack/-/archive/master/ygopro-starter-pack-master.tar.gz | tar zfx -
     - mv ygopro-starter-pack-master/* .
     # sound
-    - wget -O - https://code.mycard.moe/mycard/ygopro-sounds/-/archive/master/ygopro-sounds-master.tar.gz | tar zfx -
+    - wget -O - https://code.moenext.com/mycard/ygopro-sounds/-/archive/master/ygopro-sounds-master.tar.gz | tar zfx -
     - mv ygopro-sounds-master/sound/* sound
     # fonts
     - mkdir fonts
     - cd fonts
-    - wget -O - https://cdn01.moecube.com/ygopro-fonts.tar.gz | tar zfx -
+    - wget -O - https://cdn02.moecube.com:444/ygopro-fonts.tar.gz | tar zfx -
     - cd ..
     # pack
-    - git clone --depth=1 https://code.mycard.moe/mycard/ygopro-card-list
+    - git clone --depth=1 https://code.moenext.com/mycard/ygopro-card-list
     - mv ygopro-card-list/pack .
     # locales
-    - git clone --depth=1 https://code.mycard.moe/nanahira/ygopro-database
+    - git clone --depth=1 https://code.moenext.com/nanahira/ygopro-database
     - mv ygopro-database/locales .
   artifacts:
     paths:
@@ -263,7 +263,7 @@ assets_nonwindows:
     - linux
   script:
     - apt update; apt -y install tar wget
-    - wget -O - https://cdn01.moecube.com/windbot/windbot.tar.gz | tar zfx -
+    - wget -O - https://cdn02.moecube.com:444/windbot/windbot.tar.gz | tar zfx -
   artifacts:
     paths:
       - bot.conf
@@ -278,7 +278,7 @@ assets_windows:
   tags:
     - linux
   script:
-    - wget https://cdn01.moecube.com/windbot/WindBot.7z
+    - wget https://cdn02.moecube.com:444/windbot/WindBot.7z
     - 7z x -y WindBot.7z
     - aws s3 --endpoint=https://minio.mycard.moe:9000 sync s3://mycard/koishipro/contents/update-koishipro/ ./update-koishipro
     - rm -rf update-koishipro/.git || true

ocgcore @ ea1f4623

-Subproject commit 9e0f7bdb467b07d6f39931fda773988de084f82c
+Subproject commit ea1f4623b88d12998e548bf7fc06cc163ec823dc