From fe0ec8b79b1e18e2d1427b355b1699dc33c2e5e9 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Sat, 26 Oct 2024 04:38:20 +0500 Subject: [PATCH] blat --- .github/workflows/build.yml | 87 +++++++++++++++++++------------------ pakku.json | 2 +- 2 files changed, 45 insertions(+), 44 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 078934c0..ab9edd77 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -117,6 +117,7 @@ jobs: grooovy="./groovy/runConfig.json" cat <<< $(jq '.debug = false' $grooovy) > $grooovy + sed -i -e "s/DEV/${{ needs.info.outputs.project_version }}/g" pakku.json - name: Cache pakku uses: actions/cache@v4.1.2 @@ -171,53 +172,53 @@ jobs: path: ./build/modrinth/${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-modrinth.mrpack if-no-files-found: error - build-multimc: - name: Build MultiMC Pack - runs-on: ubuntu-latest - needs: [info] - steps: - - name: Checkout - uses: actions/checkout@v4.2.2 - - - name: Set GroovyScript debug mode to 'false' - shell: bash - run: | - set +e - - grooovy="./groovy/runConfig.json" - cat <<< $(jq '.debug = false' $grooovy) > $grooovy - - - name: Cache pakku - uses: actions/cache@v4.1.2 - with: - path: build/.cache - key: ${{ runner.OS }}-pakku-cache-${{ hashFiles('build/.cache/') }} - restore-keys: | - ${{ runner.OS }}-pakku-cache- - - - name: Export - run: | - java -jar pakku.jar --debug export - java -jar pakku.jar --debug fetch - - - name: Move files - run: | - mv -vf ./build/.cache/curseforge/* ./.pakku/multimc-overrides/ - cd ./.pakku/multimc-overrides/ - mkdir -p flame + # build-multimc: + # name: Build MultiMC Pack + # runs-on: ubuntu-latest + # needs: [info] + # steps: + # - name: Checkout + # uses: actions/checkout@v4.2.2 + + # - name: Set GroovyScript debug mode to 'false' + # shell: bash + # run: | + # set +e + + # grooovy="./groovy/runConfig.json" + # cat <<< $(jq '.debug = false' $grooovy) > $grooovy + + # - name: Cache pakku + # uses: actions/cache@v4.1.2 + # with: + # path: build/.cache + # key: ${{ runner.OS }}-pakku-cache-${{ hashFiles('build/.cache/') }} + # restore-keys: | + # ${{ runner.OS }}-pakku-cache- + + # - name: Export + # run: | + # java -jar pakku.jar --debug export + # java -jar pakku.jar --debug fetch + + # - name: Move files + # run: | + # mv -vf ./build/.cache/curseforge/* ./.pakku/multimc-overrides/ + # cd ./.pakku/multimc-overrides/ + # mkdir -p flame - # mv -vf manifest.json flame/ - cd ./.pakku/multimc-overrides/ + # # mv -vf manifest.json flame/ + # cd ./.pakku/multimc-overrides/ - zip -r ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-multimc.zip icon.png mmc-pack.json instance.cfg .minecraft/ flame/ + # zip -r ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-multimc.zip icon.png mmc-pack.json instance.cfg .minecraft/ flame/ - - name: Upload zip multimc - uses: actions/upload-artifact@v4.4.0 - with: - name: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-multimc - path: ./.pakku/multimc-overrides/${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-multimc.zip - if-no-files-found: error + # - name: Upload zip multimc + # uses: actions/upload-artifact@v4.4.0 + # with: + # name: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-multimc + # path: ./.pakku/multimc-overrides/${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-multimc.zip + # if-no-files-found: error # release: # name: Release diff --git a/pakku.json b/pakku.json index af46d3e8..bfb44750 100644 --- a/pakku.json +++ b/pakku.json @@ -1,6 +1,6 @@ { "name": "Modpack-Vintage", - "version": "4.5.3", + "version": "DEV", "description": "An innovative modpack that contains GregTech and TerraFirmaCraft on 1.12.x.", "author": "Exception, Xikaro", "overrides": [