ci

.gitlab-ci.yml

@@ -52,7 +52,7 @@ dll:
     # accelerator
     - 'sed -Ei "s/(  m_CacheServerMode: ).*$/\11/" ProjectSettings/EditorSettings.asset'
     - 'sed -Ei "s/(  m_CacheServerEndpoint: ).*$/\1unity-accelerator.myacg.cc/" ProjectSettings/EditorSettings.asset'
-    - unity-editor -quit -nographics -projectPath . -buildTarget $BUILD_TARGET -buildLinux64Player Builds/$BUILD_TARGET/$EXEC_NAME -logFile /dev/stdout
+    - 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:
     paths:
@@ -64,18 +64,58 @@ StandaloneLinux64:
   variables:
     BUILD_TARGET: StandaloneLinux64
     EXEC_NAME: MDPro3
+    BUILD_CMD: Linux64Player
 StandaloneWindows64:
   extends: .unity
   image: unityci/editor:6000.0.24f1-windows-mono-3
   variables:
     BUILD_TARGET: StandaloneWindows64
     EXEC_NAME: MDPro3.exe
+    BUILD_CMD: Windows64Player
 StandaloneOSX:
   extends: .unity
   image: unityci/editor:6000.0.24f1-mac-mono-3
   variables:
     BUILD_TARGET: StandaloneOSX
     EXEC_NAME: MDPro3.app
+    BUILD_CMD: OSXUniversalPlayer
+
+.assetbundles:
+  stage: build
+  tags:
+    - linux
+  dependencies: []
+  script:
+    # standalone
+    - mkdir -p release/Platforms
+    - git clone --depth 1 https://code.moenext.com/sherry_chaos/mdpro3-assetbundles
+
+    # Ask sherry for mdpro3-assetbundles path relationship
+    #- mv mdpro3-assetbundles/StandaloneWindows64 release/Platforms/StandaloneWindows64
+    #- mv mdpro3-assetbundles/StandaloneOSX release/Platforms/StandaloneOSX
+    #- mv mdpro3-assetbundles/StandaloneLinux64 release/Platforms/StandaloneLinux64
+    #- mv mdpro3-assetbundles/iOS release/Platforms/iOS
+    - mv mdpro3-assetbundles/$FROM release/Platforms/$TO
+
+  artifacts:
+    paths:
+      - release
+
+.assetbundles_windows:
+  extends: .standalone
+  variables:
+    FROM: StandaloneWindows64
+    TO: StandaloneWindows64
+.assetbundles_linux:
+  extends: .standalone
+  variables:
+    FROM: StandaloneLinux64
+    TO: StandaloneLinux64
+.assetbundles_macos:
+  extends: .standalone
+  variables:
+    FROM: StandaloneOSX
+    TO: StandaloneOSX
 
 resources:
   stage: build
@@ -92,16 +132,6 @@ resources:
     # Ask sherry for Picture/DIY and Sound
     - mkdir -p release/Picture/DIY release/Sound
 
-    # standalone
-    - mkdir -p release/Platforms
-    - git clone --depth 1 https://code.moenext.com/sherry_chaos/mdpro3-assetbundles
-
-    # Ask sherry for mdpro3-assetbundles path relationship
-    - mv mdpro3-assetbundles/StandaloneWindows64 release/Platforms/StandaloneWindows64
-    - mv mdpro3-assetbundles/StandaloneOSX release/Platforms/StandaloneOSX
-    - mv mdpro3-assetbundles/StandaloneLinux64 release/Platforms/StandaloneLinux64
-    - mv mdpro3-assetbundles/iOS release/Platforms/iOS
-
     # Data
     - git clone --depth 1 https://github.com/mycard/ygopro-scripts
     - rm Data/script.zip
@@ -143,6 +173,7 @@ pack_windows:
     TARGET_PLATFORM: win32
   dependencies:
     - StandaloneWindows64
+    - assetbundles_windows
     - resources
 
 pack_linux:
@@ -152,6 +183,7 @@ pack_linux:
     TARGET_PLATFORM: linux
   dependencies:
     - StandaloneLinux64
+    - assetbundles_linux
     - resources
 
 pack_macos:
@@ -161,4 +193,5 @@ pack_macos:
     TARGET_PLATFORM: darwin
   dependencies:
     - StandaloneOSX
+    - assetbundles_macos
     - resources