diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cf42d3ced..abc3678f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: project_version: ${{ steps.info.outputs.project_version }} mcversion: ${{ steps.info.outputs.mcversion }} tag: ${{ steps.version.outputs.tag }} - changelog: ${{ steps.changelog_full.outputs.description }} + changelog: ${{ steps.mod_changes.outputs.news }} steps: - name: Checkout with fetch depth 2 uses: actions/checkout@v4.1.1 @@ -228,8 +228,8 @@ jobs: # with: # path: CHANGELOG.md - build-modpack: - name: Build Modpack + build-cf-modpack: + name: Build CF Modpack runs-on: ubuntu-latest needs: [modpack-info] steps: @@ -253,6 +253,36 @@ jobs: mv -vf .github/buildtools/modpack/modlist.html ./ zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip manifest.json modlist.html overrides + - name: Upload zip cf + uses: actions/upload-artifact@v4.0.0 + with: + name: modpack_cf + path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip + + build-mmc-modpack: + name: Build MMC Modpack + runs-on: ubuntu-latest + needs: [modpack-info] + steps: + - name: Checkout + uses: actions/checkout@v4.1.1 + + - name: Replace strings + shell: bash + run: | + VERSION=${{ needs.modpack-info.outputs.project_version }} + sed -i -e "s/DEV/${VERSION}/g" ./.github/buildtools/modpack/manifest.json + sed -i -e "s/DEV/${VERSION}/g" ./.github/buildtools/modpack/instance.cfg + sed -i -e "s/DEV/${VERSION}/g" config/fancymenu/customization/main_menu.txt + sed -i -e "s/DEV/${VERSION}/g" config/bcc-common.toml + + - name: Download Mods + run: | + git submodule init + cd mods + git config --local ${{ secrets.GITHUB_TOKEN }} + git submodule update --recursive + - name: Export MMC run: | cp -r mods overrides/ @@ -260,12 +290,6 @@ jobs: mv -vf .github/buildtools/modpack/mmc-pack.json ./ mv -vf .github/buildtools/modpack/instance.cfg ./ zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc.zip mmc-pack.json instance.cfg .minecraft/ - - - name: Upload zip cf - uses: actions/upload-artifact@v4.0.0 - with: - name: modpack_cf - path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip - name: Upload zip mmc uses: actions/upload-artifact@v4.0.0 @@ -277,11 +301,16 @@ jobs: name: Build Serverpack runs-on: ubuntu-latest needs: [modpack-info] - if: startsWith(github.ref, 'refs/tags/v') steps: - name: Checkout uses: actions/checkout@v4.1.1 + - name: Replace strings + shell: bash + run: | + VERSION=${{ needs.modpack-info.outputs.project_version }} + sed -i -e "s/DEV/${VERSION}/g" config/bcc-common.toml + - name: Download Mods run: | git submodule init @@ -304,7 +333,7 @@ jobs: release: name: Release - needs: [modpack-info, build-modpack, build-serverpack] + needs: [modpack-info, build-cf-modpack, build-serverpack] if: startsWith(github.ref, 'refs/tags/') uses: ./.github/workflows/release.yml with: