Fix cicd

GTModpackTeam · May 4, 2024 · 728aab0 · 728aab0
1 parent eaf121b
commit 728aab0
Showing 1 changed file with 22 additions and 13 deletions.
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
@@ -44,12 +44,21 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set the version
+      - if: matrix.version == 'lwjgl3'
+        name: Set the version
+        run: |
+          echo "[CleanroomMMC] GregTech Expert 2 ${{ env.VERSION_LWJGL3 }}" > ./overrides/config/txloader/load/custommainmenu/version.txt
+          sed -i -e "s/MODPACKVERSION/${{ env.VERSION_LWJGL3 }}/g" ./manifest.json
+          sed -i -e "s/MODPACKVERSION/${{ env.VERSION_LWJGL3 }}/g" ./instance.cfg
+          sed -i -e "s/MODPACKVERSION/${{ env.VERSION_LWJGL3 }}/g" ./overrides/config/craftpresence.json
+
+      - if: matrix.version == 'normal'
+        name: Set the version
         run: |
-          echo "GregTech Expert 2 ${{ matrix.version }}" > ./overrides/config/txloader/load/custommainmenu/version.txt
-          sed -i -e "s/MODPACKVERSION/${{ matrix.version }}/g" ./manifest.json
-          sed -i -e "s/MODPACKVERSION/${{ matrix.version }}/g" ./instance.cfg
-          sed -i -e "s/MODPACKVERSION/${{ matrix.version }}/g" ./overrides/config/craftpresence.json
+          echo "GregTech Expert 2 ${{ env.VERSION_NORMAL }}" > ./overrides/config/txloader/load/custommainmenu/version.txt
+          sed -i -e "s/MODPACKVERSION/${{ env.VERSION_NORMAL }}/g" ./manifest.json
+          sed -i -e "s/MODPACKVERSION/${{ env.VERSION_NORMAL }}/g" ./instance.cfg
+          sed -i -e "s/MODPACKVERSION/${{ env.VERSION_NORMAL }}/g" ./overrides/config/craftpresence.json
 
       - name: Setup Python
         uses: actions/setup-python@v5
@@ -85,7 +94,7 @@ jobs:
         name: Archive Release CF
         run: |
           rm -rf ./overrides/resourcepacks/.gitkeep
-          zip -r ./${{ env.NAME }}-cf.zip ./manifest.json ./modlist.html ./overrides/bansoukou/ ./overrides/config/ ./overrides/local/ ./overrides/resourcepacks/ ./overrides/scripts/
+          zip -r ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-cf.zip ./manifest.json ./modlist.html ./overrides/bansoukou/ ./overrides/config/ ./overrides/local/ ./overrides/resourcepacks/ ./overrides/scripts/
 
       - if: matrix.version == 'lwjgl3'
         name: Archive Release MMC(LWJGL3)
@@ -97,15 +106,15 @@ jobs:
           cp -rvf ./cmmc/* ./
           rm -rf .minecraft/mods/.gitkeep
           rm -rf .minecraft/resourcepacks/.gitkeep
-          zip -r ./${{ env.NAME }}-${{ matrix.version }}-mmc.zip ./libraries/ ./patches/ ./mmc-pack.json ./instance.cfg .minecraft/
+          zip -r ./${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}-mmc.zip ./libraries/ ./patches/ ./mmc-pack.json ./instance.cfg .minecraft/
 
       - if: matrix.version == 'normal'
         name: Archive Release MMC
         run: |
           mv -vf ./overrides/ .minecraft/
           cp -vf ./icon.png .minecraft/
           rm -rf .minecraft/mods/.gitkeep
-          zip -r ./${{ env.NAME }}-${{ matrix.version }}-mmc.zip ./mmc-pack.json ./instance.cfg .minecraft/
+          zip -r ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-mmc.zip ./mmc-pack.json ./instance.cfg .minecraft/
 
       - if: matrix.version == 'normal'
         name: Move Server Files
@@ -116,7 +125,7 @@ jobs:
         name: Archive Release Server
         run: |
           mv -vf .minecraft/* ./
-          zip -r ./${{ env.NAME }}-${{ matrix.version }}-server.zip ./docker-compose.yml ./PleaseRead.txt ./log4j2_112-116.xml ./Install.bat ./Install.sh ./ServerStart.bat ./ServerStart.sh ./settings.bat ./settings.sh ./TmuxServer.sh ./bansoukou/ ./config/ ./local/ ./mods/ ./resources/ ./scripts/
+          zip -r ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-server.zip ./docker-compose.yml ./PleaseRead.txt ./log4j2_112-116.xml ./Install.bat ./Install.sh ./ServerStart.bat ./ServerStart.sh ./settings.bat ./settings.sh ./TmuxServer.sh ./bansoukou/ ./config/ ./local/ ./mods/ ./resources/ ./scripts/
 
       - if: matrix.version == 'lwjgl3'
         name: Create GitHub Release
@@ -126,7 +135,7 @@ jobs:
           prerelease: true
           generate_release_notes: true
           files: |
-            ./${{ env.NAME }}-${{ matrix.version }}-mmc.zip
+            ./${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}-mmc.zip
 
       - if: matrix.version == 'normal'
         name: Create GitHub Release
@@ -136,6 +145,6 @@ jobs:
           prerelease: true
           generate_release_notes: true
           files: |
-            ./${{ env.NAME }}-${{ matrix.version }}-cf.zip
-            ./${{ env.NAME }}-${{ matrix.version }}-mmc.zip
-            ./${{ env.NAME }}-${{ matrix.version }}-server.zip
+            ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-cf.zip
+            ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-mmc.zip
+            ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-server.zip