diff options
| author | LifeIsAParadox <LifeIsAParadox@users.noreply.github.com> | 2021-10-15 01:24:13 +0200 |
|---|---|---|
| committer | LifeIsAParadox <LifeIsAParadox@users.noreply.github.com> | 2021-10-15 01:24:13 +0200 |
| commit | 7d93f67afcc1856de9a28af07a4ad2e138387399 (patch) | |
| tree | 6932c3a0682facabea9b626dd76483b7d3af324c | |
| parent | 17a4e0804c3e07472a7ebdfa17142dbd16ba5d67 (diff) | |
| download | Skyblocker-7d93f67afcc1856de9a28af07a4ad2e138387399.tar.gz Skyblocker-7d93f67afcc1856de9a28af07a4ad2e138387399.tar.bz2 Skyblocker-7d93f67afcc1856de9a28af07a4ad2e138387399.zip | |
changed workflow + update to 1.2.1
the assets are now automatically uploaded on github release (github and modrinth)
| -rw-r--r-- | .github/workflows/beta.yml | 7 | ||||
| -rw-r--r-- | .github/workflows/buildrelease.yml | 32 | ||||
| -rw-r--r-- | CHANGELOG.md | 55 | ||||
| -rw-r--r-- | build.gradle | 24 | ||||
| -rw-r--r-- | gradle.properties | 5 |
5 files changed, 118 insertions, 5 deletions
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index 2d24d401..54292277 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -1,6 +1,11 @@ name: Build Beta -on: [ push, pull_request ] +on: + push: + branches: + - '**' + pull_request: + jobs: # This workflow contains a single job called "build" diff --git a/.github/workflows/buildrelease.yml b/.github/workflows/buildrelease.yml index a74f6d9c..546a6174 100644 --- a/.github/workflows/buildrelease.yml +++ b/.github/workflows/buildrelease.yml @@ -32,4 +32,34 @@ jobs: - uses: actions/upload-artifact@v2 with: name: Artifacts - path: build/libs/
\ No newline at end of file + path: build/libs/ + + - name: Read Changelog + id: read_changelog + shell: bash + run: | + CHANGELOG=$(sed '/___/Q' CHANGELOG.md | grep -v '# ') + echo "Changelog:\n$CHANGELOG" + CHANGELOG="${CHANGELOG//'%'/'%25'}" + CHANGELOG="${CHANGELOG//$'\n'/'%0A'}" + CHANGELOG="${CHANGELOG//$'\r'/'%0D'}" + echo "::set-output name=changelog::$CHANGELOG" + + - uses: actions/github-script@v2 + id: fname + with: + result-encoding: string + script: | + const fs = require("fs") + return fs.readdirSync("build/libs/").filter(e => !e.endsWith("dev.jar") && !e.endsWith("sources.jar") && e.endsWith(".jar"))[0] + + - uses: softprops/action-gh-release@v1 + with: + body: ${{ steps.read_changelog.outputs.changelog }} + files: build/libs/${{ steps.fname.outputs.result }} + + - name: Publish to Modrinth + env: + MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} + CHANGELOG: ${{ steps.read_changelog.outputs.changelog }} + run: ./gradlew publishModrinth
\ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..9c6a7674 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,55 @@ +# Release 1.2.1 + +Fixes +* Various fixes by @ExternalTime in #20 + +**Full Changelog**: https://github.com/LifeIsAParadox/Skyblocker/compare/v1.2.0...v1.2.1 +___ +# Release 1.2.0 + +New features +* F7 Terminal Solver: Order, Color, Name by @ExternalTime in #19 +* Auto highlight Blaze puzzle by @LifeIsAParadox +* Added bazaar price to tooltip by @LifeIsAParadox + +Fixes +* Small fixes to solvers by @ExternalTime in #16 +* Fixed status bar parsing when using healing wands by @ExternalTime in #18 +* Blaze outline off center fix @LifeIsAParadox + +added German language + +**Full Changelog**: https://github.com/LifeIsAParadox/Skyblocker/compare/v1.1.0...v1.2.0 +___ +# Release 1.1.0 +Now using semantic Versioning \ +thanks to @ExternalTime for the fixes and for implementing the new feature + +New features +* added reparty /rp #14 +* Added absorption bar on top of health bar (currently the bar length for absorption is really tiny, if you have an idea how to implement it better post a suggestion here or in the skyblocker discord). #9 + + +Fixes +* fixed health bar always full visual bug #9 +* fixed lag when opening inventory for the first time #12 +* and other fixes # + +___ +# Release 1.0.7.1 + +* small fix +* fixed bug in health and map inside dungeon + +___ +# Release 1.0.7 + +* bugfixes +* add spam filter [thanks to Dessahw aka ExternalTime] #5 +* add Blaze Solver + +___ +# Skyblocker Fabric 1.17.1 + +This release updates the skyblocker mod to mc version 1.17. +This is the first time i created/edited a mod.
\ No newline at end of file diff --git a/build.gradle b/build.gradle index 4594368c..43ca9fe0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,17 @@ plugins { id 'fabric-loom' version '0.9-SNAPSHOT' id 'maven-publish' + id 'com.modrinth.minotaur' version '1.2.+' } +import com.modrinth.minotaur.TaskModrinthUpload +import com.modrinth.minotaur.request.VersionType + sourceCompatibility = JavaVersion.VERSION_16 targetCompatibility = JavaVersion.VERSION_16 archivesBaseName = project.archives_base_name -version = project.mod_version +version = "${project.mod_version}+${project.minecraft_version}" group = project.maven_group repositories { @@ -90,6 +94,24 @@ test { useJUnitPlatform() } +task publishModrinth(type: TaskModrinthUpload) { + dependsOn(build) + onlyIf { + System.getenv('MODRINTH_TOKEN') + } + + token = System.getenv('MODRINTH_TOKEN') + projectId = project.modrinth_id + versionNumber = version + versionName = "Skyblocker ${project.mod_version} (${project.minecraft_version})" + uploadFile = remapJar + addGameVersion((String) project.minecraft_version) + addLoader('fabric') + versionType = VersionType.RELEASE + changelog = System.getenv('CHANGELOG') + +} + // configure the maven publication publishing { publications { diff --git a/gradle.properties b/gradle.properties index 60311ca8..a2ef164f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,6 +15,7 @@ clothconfig_version=5.0.38 mod_menu_version=2.0.4 # Mod Properties -mod_version = 1.2.0 +mod_version = 1.2.1 maven_group = me.xmrvizzy -archives_base_name = skyblocker
\ No newline at end of file +archives_base_name = skyblocker +modrinth_id=y6DuFGwJ
\ No newline at end of file |