diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index b3179c758..4d3290e98 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -14,7 +14,7 @@ jobs: - name: Get the version id: get_version - run: echo ::set-output name=version::${GITHUB_REF#refs/tags/} + run: echo ::set-output name=version::${GITHUB_REF#refs/tags/Pre} - name: Changelog Parser id: changelog @@ -22,33 +22,30 @@ jobs: with: path: CHANGELOG.md - - name: move - run: rsync -av --exclude-from='./.github/buildtools/filelist.txt' ./ .minecraft/ - - name: Set the version run: | DEV=${{ steps.get_version.outputs.version }} sed -i -e "s/DEV/${DEV}/g" manifest.json sed -i -e "s/DEV/${DEV}/g" instance.cfg - sed -i -e "s/DEV/${DEV}/g" .minecraft/config/fancymenu/customization/main_menu.txt - sed -i -e "s/DEV/${DEV}/g" .minecraft/config/bcc-common.toml + sed -i -e "s/DEV/${DEV}/g" config/fancymenu/customization/main_menu.txt + sed -i -e "s/DEV/${DEV}/g" config/bcc-common.toml - - name: Archive Release MMC + - name: Move + run: rsync -av --exclude-from='.github/buildtools/filelist.txt' ./ .minecraft/ + + - name: Archive MMC run: zip -r TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-mmc.zip mmc-pack.json instance.cfg .minecraft/ - - name: Archive Release CF + - name: Archive CF run: | mv -vf .minecraft/ ./overrides/ zip -r TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-cf.zip ./manifest.json ./modlist.html ./overrides/config/ ./overrides/kubejs/ ./overrides/defaultconfigs/ - - name: Deleting Client Resources + - name: Archive Server run: | cd ./overrides/ cat ../.github/buildtools/client_mod.txt | while read -r line; do find ./mods -name "$line" -delete; done rm -rf ./shaderpacks - - - name: Archive Release Server - run: | cp -r ./.github/buildtools/serverfiles/* ./overrides/ cd ./overrides/ zip -r ../TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-server.zip ./ @@ -57,7 +54,7 @@ jobs: uses: softprops/action-gh-release@v0.1.15 if: startsWith(github.ref, 'refs/tags/') with: - prerelease: true + prerelease: false generate_release_notes: true name: Release ${{ steps.changelog.outputs.version }} body: ${{ steps.changelog.outputs.description }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c403e6c1f..ecb4f8d2f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,8 +27,8 @@ jobs: DEV=${{ steps.get_version.outputs.version }} sed -i -e "s/DEV/${DEV}/g" manifest.json sed -i -e "s/DEV/${DEV}/g" instance.cfg - sed -i -e "s/DEV/${DEV}/g" .minecraft/config/fancymenu/customization/main_menu.txt - sed -i -e "s/DEV/${DEV}/g" .minecraft/config/bcc-common.toml + sed -i -e "s/DEV/${DEV}/g" config/fancymenu/customization/main_menu.txt + sed -i -e "s/DEV/${DEV}/g" config/bcc-common.toml - name: Move run: rsync -av --exclude-from='.github/buildtools/filelist.txt' ./ .minecraft/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 255b3ae90..5f7d17a4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # Changelog -## [0.1.0] - 2023-11-26 +## [0.1.0] - 2023-11-27 ### Fixes - Исправлен баг, когда можно было дублировать металл через броню, пластины, палки и другое. - Исправлен баг, когда обычные железные слитки нельзя было расплавить в железо.