simplify

.gitlab-ci.yml

@@ -7,31 +7,6 @@ stages:
   - pack
   - deploy
 
-assetbundles:
-  stage: prepare
-  tags:
-    - linux
-  dependencies: []
-  script:
-    - mkdir Platforms
-    - wget -O - https://cdn02.moecube.com:444/mdpro3-assetbundles/$BUILD_TARGET.tar.zst | tar -I 'zstd -T0' -xf - -C Platforms
-  artifacts:
-    paths:
-      - Platforms
-
-assetbundles_windows:
-  extends: .assetbundles
-  variables:
-    BUILD_TARGET: StandaloneWindows64
-assetbundles_linux:
-  extends: .assetbundles
-  variables:
-    BUILD_TARGET: StandaloneLinux64
-assetbundles_macos:
-  extends: .assetbundles
-  variables:
-    BUILD_TARGET: StandaloneOSX
-
 dll:
   stage: prepare
   tags:
@@ -69,6 +44,7 @@ dll:
     BUILD_TARGET: StandaloneLinux64
     EXEC_NAME: MDPro3
   script:
+    - apt update; apt -y install wget tar zstd
     # license
     - mkdir -p ~/.local/share/unity3d/Unity
     - ln -sf $UNITY_LICENSE ~/.local/share/unity3d/Unity/Unity_lic.ulf
@@ -77,6 +53,10 @@ dll:
     # accelerator
     - 'sed -Ei "s/(  m_CacheServerMode: ).*$/\11/" ProjectSettings/EditorSettings.asset'
     - 'sed -Ei "s/(  m_CacheServerEndpoint: ).*$/\1unity-accelerator.myacg.cc/" ProjectSettings/EditorSettings.asset'
+    # Platform
+    - mkdir -p Platforms
+    - wget -O - https://cdn02.moecube.com:444/mdpro3-assetbundles/$BUILD_TARGET.tar.zst | tar -I 'zstd -T0' -xf - -C Platforms
+    # build
     - unity-editor -quit -nographics -projectPath . -buildTarget $BUILD_TARGET -build$BUILD_CMD Builds/$BUILD_TARGET/$EXEC_NAME -logFile /dev/stdout
     - rm -rf Builds/$BUILD_TARGET/MDPro3_BurstDebugInformation_DoNotShip
   artifacts:
@@ -86,9 +66,6 @@ dll:
 StandaloneLinux64:
   extends: .unity
   image: unityci/editor:6000.0.24f1-base-3
-  dependencies:
-    - dll
-    - assetbundles_linux
   variables:
     BUILD_TARGET: StandaloneLinux64
     EXEC_NAME: MDPro3
@@ -96,9 +73,6 @@ StandaloneLinux64:
 StandaloneWindows64:
   extends: .unity
   image: unityci/editor:6000.0.24f1-windows-mono-3
-  dependencies:
-    - dll
-    - assetbundles_windows
   variables:
     BUILD_TARGET: StandaloneWindows64
     EXEC_NAME: MDPro3.exe
@@ -106,9 +80,6 @@ StandaloneWindows64:
 StandaloneOSX:
   extends: .unity
   image: unityci/editor:6000.0.24f1-mac-mono-3
-  dependencies:
-    - dll
-    - assetbundles_macos
   variables:
     BUILD_TARGET: StandaloneOSX
     EXEC_NAME: MDPro3.app