sync ci

.ci/asset-branch

+export ASSET_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
+  export ASSET_BRANCH_NAME="develop"
+fi

.ci/assets-locale.sh

 #!/bin/bash
 set -x
 set -o errexit
+source .ci/asset-branch
 # ygopro-database
-apt update && apt -y install wget git libarchive-tools
-git clone --depth=1 https://code.mycard.moe/mycard/ygopro-database
-cp -rf ./ygopro-database/locales/$TARGET_LOCALE/* .
+apt update && apt -y install wget git libarchive-tools sqlite3
+git clone --depth=1 -b "$ASSET_BRANCH_NAME" https://code.moenext.com/mycard/ygopro-database
+cp -rf ./ygopro-database/locales/$TARGET_LOCALE/strings.conf .
+rm -f cards.cdb
+sqlite3 ./ygopro-database/locales/$TARGET_LOCALE/cards.cdb .dump | sqlite3 cards.cdb
 # ygopro-images
 mkdir pics
-# skip it in develop branch
-wget -O - https://cdn01.moecube.com/images/ygopro-images-${TARGET_LOCALE}.zip | bsdtar -C pics -xf -
+if [[ "$ASSET_BRANCH_NAME" == "develop" ]]; then
+  echo "This is a pre-release, skipping download."
+else
+  wget -O - https://cdn02.moecube.com:444/images/ygopro-images-${TARGET_LOCALE}.zip | bsdtar -C pics -xf -
+fi

.ci/build-opus.sh

+#!/bin/sh
+set -x
+set -o errexit
+
+cd miniaudio
+
+external_built_dir="$PWD/external-built"
+
+is_macos=false
+if [ "$(uname)" = "Darwin" ]; then
+  is_macos=true
+fi
+
+maybe_patch_configure() {
+  if $is_macos; then
+    sed -i.bak 's/-force_cpusubtype_ALL//g' configure*
+  fi
+}
+
+build_single_thing() {
+  lib_name="$1"
+  cd "external/$lib_name"
+  shift
+  maybe_patch_configure
+  PKG_CONFIG_PATH="$external_built_dir/lib/pkgconfig" CFLAGS="$OPUS_FLAGS" CXXFLAGS="$OPUS_FLAGS" ./configure --prefix="$external_built_dir" --enable-static=yes --enable-shared=no "$@"
+  make -j$(nproc)
+  make install
+  cd ../..
+}
+
+build_single_thing ogg
+build_single_thing opus
+build_single_thing opusfile --disable-examples --disable-http
+build_single_thing vorbis --with-ogg="$external_built_dir"
+
+cd ..

.ci/exec-macos-platform.sh

@@ -6,16 +6,20 @@ TARGET_PLATFORM=$(arch)
 TARGET_YGOPRO_BINARY_PATH=./ygopro-platforms/ygopro-platform-$TARGET_PLATFORM
 export EVENT_INCLUDE_DIR=$PWD/libevent-stable/include
 export EVENT_LIB_DIR=$PWD/libevent-stable/lib
-export IRRLICHT_INCLUDE_DIR=$PWD/irrlicht/include
-export IRRLICHT_LIB_DIR=$PWD/irrlicht/lib/$(arch)
+export OPUS_INCLUDE_DIR=$PWD/miniaudio/external-built/include/opus
+export OPUS_LIB_DIR=$PWD/miniaudio/external-built/lib
+export VORBIS_INCLUDE_DIR=$PWD/miniaudio/external-built/include
+export VORBIS_LIB_DIR=$PWD/miniaudio/external-built/lib
+export OGG_INCLUDE_DIR=$PWD/miniaudio/external-built/include
+export OGG_LIB_DIR=$PWD/miniaudio/external-built/lib
 
 ./.ci/libevent-prebuild.sh
+./.ci/build-opus.sh
 
-chmod +x ./premake5
-./premake5 gmake --cc=clang --build-freetype --build-sqlite --no-use-irrklang
+./premake5 gmake --cc=clang --build-freetype --build-sqlite
 
 cd build
-make config=release -j4
+make config=release -j$(nproc)
 cd ..
 
 mkdir ygopro-platforms

.ci/libevent-prebuild.sh

@@ -3,7 +3,7 @@ set -x
 set -o errexit
 # PROCESSOR_COUNT=4
 
-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 -
 cd libevent-2.0.22-stable
 ./configure --prefix=$PWD/libevent-stable --disable-openssl --enable-static=yes --enable-shared=no
 make -j$PROCESSOR_COUNT

.ci/pack-linux.sh

@@ -5,4 +5,4 @@ set -o errexit
 
 apt update && apt -y install tar git zstd
 mkdir dist replay
-tar --zstd -cf dist/ygopro-$CI_COMMIT_REF_NAME-linux-$TARGET_LOCALE.tar.zst --exclude='.git*' ygopro LICENSE README.md lib lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound windbot bot bot.conf pack
+tar --zstd -cf dist/ygopro-$CI_COMMIT_REF_NAME-linux-$TARGET_LOCALE.tar.zst --exclude='.git*' ygopro LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound windbot bot bot.conf pack fonts

.ci/pack-macos.sh

@@ -5,4 +5,4 @@ set -o errexit
 
 apt update && apt -y install tar git zstd
 mkdir dist replay
-tar --zstd -cf dist/ygopro-$CI_COMMIT_REF_NAME-darwin-$TARGET_LOCALE.tar.zst --exclude='.git*' ygopro.app LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay windbot bot bot.conf pack
+tar --zstd -cf dist/ygopro-$CI_COMMIT_REF_NAME-darwin-$TARGET_LOCALE.tar.zst --exclude='.git*' ygopro.app LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound windbot bot bot.conf pack fonts

.ci/pack-windows.sh

@@ -5,4 +5,4 @@ set -o errexit
 
 apt update && apt -y install tar git zstd
 mkdir dist replay
-tar --zstd -cf dist/ygopro-$CI_COMMIT_REF_NAME-win32-$TARGET_LOCALE.tar.zst --exclude='.git*' ygopro.exe LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound bot.conf Bot.exe WindBot pack
+tar --zstd -cf dist/ygopro-$CI_COMMIT_REF_NAME-win32-$TARGET_LOCALE.tar.zst --exclude='.git*' ygopro.exe LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound bot.conf Bot.exe WindBot pack fonts

.ci/prepare-irrlicht.sh

+#!/bin/bash
+set -x
+set -o errexit
+source .ci/asset-branch
+
+IRRLICHT_REPO_URL="https://code.moenext.com/mycard/irrlicht-new.git"
+IRRLICHT_BRANCH_NAME="$ASSET_BRANCH_NAME"
+
+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/prepare-miniaudio.sh

+#!/bin/sh
+set -x
+set -o errexit
+
+if [ ! -d "miniaudio" ]; then
+  git clone --depth=1 --branch 0.11.22 https://github.com/mackron/miniaudio
+fi
+
+cp -rf miniaudio/extras/miniaudio_split/miniaudio.* miniaudio/
+
+mkdir -p miniaudio/external
+
+install_external() {
+  dir="$1"
+  url="$2"
+  if [ ! -d "miniaudio/external/$dir" ]; then
+    mkdir -p "miniaudio/external/$dir"
+    # Download the external library and strip one level of directories from the archive
+    wget -O - "$url" | tar --strip-components=1 -C "miniaudio/external/$dir" -zxf -
+  fi
+}
+
+install_external "ogg" "https://github.com/xiph/ogg/releases/download/v1.3.5/libogg-1.3.5.tar.gz"
+install_external "opus" "https://github.com/xiph/opus/releases/download/v1.5.2/opus-1.5.2.tar.gz"
+install_external "opusfile" "https://github.com/xiph/opusfile/releases/download/v0.12/opusfile-0.12.tar.gz"
+install_external "vorbis" "https://github.com/xiph/vorbis/releases/download/v1.3.7/libvorbis-1.3.7.tar.gz"

.ci/upload-packager.sh

@@ -33,9 +33,15 @@ 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
+source .ci/asset-branch
+
+if [[ "$ASSET_BRANCH_NAME" == "develop" ]]; 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

@@ -15,14 +15,18 @@ 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
+    # irrlicht
+    - ./.ci/prepare-irrlicht.sh
+    # miniaudio
+    - ./.ci/prepare-miniaudio.sh
     # premake
     - cp -rf premake/* .;
   artifacts:
@@ -30,6 +34,8 @@ mat_common:
       - lua
       - freetype
       - sqlite3
+      - irrlicht
+      - miniaudio
 
 mat_submodules:
   stage: prepare
@@ -45,47 +51,21 @@ mat_submodules:
       - ocgcore
       - script
 
-mat_irrklang:
-  stage: prepare
-  tags:
-    - linux
-  script:
-    - apt update; apt -y install git
-    - mkdir -p ~/.ssh; chmod 700 ~/.ssh; echo "$NANAHIRA_SSH_KEY" | base64 --decode > ~/.ssh/id_rsa; chmod 600 ~/.ssh/id_rsa
-    - ssh-keyscan git.mycard.moe >> ~/.ssh/known_hosts
-    - git clone --depth=1 git@git.mycard.moe:nanahira/irrklang
-    - mv -f irrklang/plugins/ikpmp3 .
-  artifacts:
-    paths:
-      - irrklang
-      - ikpmp3
-
-mat_linux:
-  stage: prepare
-  tags:
-    - linux
-  script:
-    - apt update; apt -y install git wget tar
-    - git clone --depth=1 https://code.mycard.moe/mycard/irrlicht-new irrlicht
-    # - wget -O - https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-beta5-linux.tar.gz | tar zfx -
-    # - env PROCESSOR_COUNT=$(nproc) ./.ci/libevent-prebuild.sh
-  artifacts:
-    paths:
-      # - premake5
-      - irrlicht
-      # - libevent-stable
-  image: git-registry.mycard.moe/mycard/docker-runner-base:debian11
-
-#mat_macos_irrklang_patched:
-#  stage: build
+#mat_linux:
+#  stage: prepare
 #  tags:
 #    - linux
-#  dependencies: []
 #  script:
-#    - wget -O - https://cdn01.moecube.com/ygopro-build-materials/libirrklang-patched-dylib.tar.gz | tar zfx -
+#    - apt update; apt -y install git wget tar
+#    - ./.ci/prepare-irrlicht.sh
+#    # - wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/premake-5.0.0-beta5-linux.tar.gz | tar zfx -
+#    # - env PROCESSOR_COUNT=$(nproc) ./.ci/libevent-prebuild.sh
 #  artifacts:
 #    paths:
-#      - libirrklang-patched.dylib
+#      # - premake5
+#      - irrlicht
+#      # - libevent-stable
+#  image: git-registry.mycard.moe/mycard/docker-runner-base:debian11
 
 mat_macos:
   stage: prepare
@@ -93,16 +73,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://cdn01.moecube.com/ygopro-build-materials/libirrklang-patched-dylib.tar.gz | tar zfx -
-    - mkdir irrlicht
-    - cd irrlicht
-    - wget -O - https://cdn01.moecube.com/ygopro-build-materials/irrlicht-mycard-mac.tar.gz | tar zfx -
-    - cd ..
+    - wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/premake-5.0.0-beta5-macosx.tar.gz | tar zfx -
+    - chmod +x premake5
   artifacts:
     paths:
       - premake5
-      - irrlicht
 
 mat_windows:
   stage: prepare
@@ -111,18 +86,15 @@ 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 https://code.mycard.moe/mycard/irrlicht-new irrlicht
   artifacts:
     paths:
       - premake5.exe
       - event
-      - irrlicht
 
 exec_windows:
   stage: build
@@ -130,7 +102,6 @@ exec_windows:
     - vs
   dependencies:
     - mat_common
-    - mat_irrklang
     - mat_windows
     - mat_submodules
   cache:
@@ -140,7 +111,7 @@ exec_windows:
       - obj/
   script:
     - bash -c 'cp -rf premake/* . ; cp -rf resource/* .'
-    - '.\premake5.exe vs2019 --irrklang-pro'
+    - '.\premake5.exe vs2019'
     - cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\msbuild.exe" build\YGOPro.sln /m /p:Configuration=Release'
     - copy bin\release\ygopro.exe .
   artifacts:
@@ -151,24 +122,28 @@ exec_linux:
   stage: build
   tags:
     - linux
+  image: git-registry.moenext.com/mycard/docker-ygopro-builder:latest
   dependencies:
     - mat_common
-    - mat_irrklang
-    - mat_linux
+    #- mat_linux
     - mat_submodules
+  variables:
+    EVENT_INCLUDE_DIR: /usr/share/libevent-stable/include
+    EVENT_LIB_DIR: /usr/share/libevent-stable/lib
+    OPUS_INCLUDE_DIR: $CI_PROJECT_DIR/miniaudio/external-built/include/opus
+    OPUS_LIB_DIR: $CI_PROJECT_DIR/miniaudio/external-built/lib
+    VORBIS_INCLUDE_DIR: $CI_PROJECT_DIR/miniaudio/external-built/include
+    VORBIS_LIB_DIR: $CI_PROJECT_DIR/miniaudio/external-built/lib
+    OGG_INCLUDE_DIR: $CI_PROJECT_DIR/miniaudio/external-built/include
+    OGG_LIB_DIR: $CI_PROJECT_DIR/miniaudio/external-built/lib
   cache:
     key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
     paths:
       - bin/
       - obj/
   script:
-    - apt update; apt -y install git build-essential libgl1-mesa-dev libglu-dev libxxf86vm-dev
-    - mkdir lib
-    - cp -rf irrklang/bin/linux-gcc-64/libIrrKlang.so ./lib/
-    # - cp -rf irrklang/bin/linux-gcc-64/ikpMP3.so ./lib/
-    - export EVENT_INCLUDE_DIR=/usr/share/libevent-stable/include
-    - export EVENT_LIB_DIR=/usr/share/libevent-stable/lib
-    - premake5 gmake --build-freetype --build-sqlite --build-irrlicht --build-ikpmp3 --irrklang-pro
+    - ./.ci/build-opus.sh
+    - premake5 gmake --build-freetype --build-sqlite
     - cd build
     - make config=release -j$(nproc)
     - cd ..
@@ -177,8 +152,6 @@ exec_linux:
   artifacts:
     paths:
       - ygopro
-      - lib
-  image: git-registry.moenext.com/mycard/docker-ygopro-builder:latest
 
 .exec_macos_platform:
   stage: build
@@ -215,17 +188,11 @@ exec_macos:
   dependencies:
     - exec_macos_platform_x86
     - exec_macos_platform_m1
-    #- mat_macos_irrklang_patched
   script:
     - mkdir -p ygopro.app/Contents/MacOS ygopro.app/Contents/Frameworks;
     - lipo -create -output ygopro.app/Contents/MacOS/ygopro $(ls -1 ygopro-platforms/ygopro-platform-*);
-    # do some special things for irrklang
-   # - mv ./libirrklang-patched.dylib ygopro.app/Contents/Frameworks/libirrklang.dylib 
-    #- install_name_tool -change /usr/local/lib/libirrklang.dylib @executable_path/../Frameworks/libirrklang.dylib ygopro.app/Contents/MacOS/ygopro
-    #- dylibbundler -x ygopro.app/Contents/MacOS/ygopro -b -d ygopro.app/Contents/Frameworks/ -p @executable_path/../Frameworks/ -cd -i @executable_path/../Frameworks;
-    #- strip ygopro.app/Contents/MacOS/ygopro;
     - mkdir ygopro.app/Contents/Resources;
-    - mv premake/gframe/ygopro.icns ygopro.app/Contents/Resources/Icon.icns;
+    - mv resource/gframe/ygopro.icns ygopro.app/Contents/Resources/Icon.icns;
     - defaults write "$PWD/ygopro.app/Contents/Info.plist" "CFBundleIconFile" "Icon.icns";
     - defaults write "$PWD/ygopro.app/Contents/Info.plist" "CFBundleIdentifier" "moe.mycard.ygopro";
 
@@ -254,18 +221,16 @@ 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 -
-    - cd ..
+    - git clone --depth=1 https://code.moenext.com/mycard/ygopro-fonts
+    - mv ygopro-fonts/fonts .
     # 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 .
   artifacts:
     paths:
@@ -284,7 +249,7 @@ assets_nonwindows:
     - linux
   script:
     - apt update; apt -y install tar wget
-    - wget -O - https://cdn01.moecube.com/windbot-mc/windbot.tar.gz | tar zfx -
+    - wget -O - https://cdn02.moecube.com:444/windbot-mc/windbot.tar.gz | tar zfx -
   artifacts:
     paths:
       - bot.conf
@@ -300,7 +265,7 @@ assets_windows:
     - linux
   script:
     - apt update; apt -y install wget p7zip-full
-    - wget https://cdn01.moecube.com/windbot-mc/WindBot.7z
+    - wget https://cdn02.moecube.com:444/windbot-mc/WindBot.7z
     - 7z x -y WindBot.7z
   artifacts:
     paths:
@@ -498,6 +463,5 @@ upload:
   variables:
     appVersion: $CI_COMMIT_TAG
   script: ./.ci/upload-packager.sh
-  #script: 'true'
   only:
     - tags