-
Notifications
You must be signed in to change notification settings - Fork 98
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main' into patch-37
# Conflicts: # src/client/java/minicraft/gfx/Color.java
- Loading branch information
Showing
274 changed files
with
11,133 additions
and
4,893 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,75 @@ | ||
| name: Nightly build | ||
| name: AutoRelease & Build | ||
| on: | ||
| schedule: | ||
| - cron: '0 0 * * *' | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| gradle: | ||
| strategy: | ||
| matrix: | ||
| os: [ubuntu-latest] | ||
| runs-on: ${{ matrix.os }} | ||
| permissions: | ||
| contents: write | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
| token: ${{ secrets.LITOROMTOKEN }} | ||
| - name: Update ingame version | ||
| uses: jacobtomlinson/gha-find-replace@v3 | ||
| with: | ||
| find: "${{ vars.VERSION }}-dev${{ vars.VERSION_old }}" | ||
| replace: "${{ vars.VERSION }}-dev${{ vars.VERSION_s }}" | ||
| include: "src/client/java/minicraft/core/Game.java" | ||
| - name: Update gradle version | ||
| uses: jacobtomlinson/gha-find-replace@v3 | ||
| with: | ||
| find: "version = \"${{ vars.VERSION }}-dev${{ vars.VERSION_old }}\"" | ||
| replace: "version = \"${{ vars.VERSION }}-dev${{ vars.VERSION_s }}\"" | ||
| include: "build.gradle" | ||
| - name: Push changes | ||
| uses: stefanzweifel/git-auto-commit-action@v4 | ||
| with: | ||
| commit_message: "Increment Version" | ||
| token: ${{ secrets.LITOROMTOKEN }} | ||
| repository: ${{ secrets.GITHUB_REPOSITORY }} | ||
| branch: ${{ github.ref }} | ||
|
|
||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| distribution: temurin | ||
| java-version: 8 | ||
|
|
||
| - name: Increment old version number | ||
| uses: action-pack/increment@v2 | ||
| with: | ||
| name: 'VERSION_old' | ||
| token: ${{ secrets.LITOROMTOKEN }} | ||
| repository: ${{ secrets.GITHUB_REPOSITORY }} | ||
| owner: 'MinicraftPlus' | ||
|
|
||
| - name: Increment new version number | ||
| uses: action-pack/increment@v2 | ||
| with: | ||
| name: 'VERSION_s' | ||
| token: ${{ secrets.LITOROMTOKEN }} | ||
| repository: ${{ secrets.GITHUB_REPOSITORY }} | ||
| owner: 'MinicraftPlus' | ||
|
|
||
| - name: Setup Gradle | ||
| uses: gradle/gradle-build-action@v2.4.2 | ||
|
|
||
| - name: Execute Gradle build | ||
| run: ./gradlew build | ||
| - uses: actions/upload-artifact@v3.1.2 | ||
|
|
||
| - uses: "dciborow/action-github-releases@v1.0.1" | ||
| with: | ||
| name: "Nightly release" | ||
| path: | | ||
| repo_token: "${{ secrets.GITHUB_TOKEN }}" | ||
| automatic_release_tag: "v${{ vars.VERSION }}-dev${{ vars.VERSION_s }}" | ||
| prerelease: true | ||
| title: "Version ${{ vars.VERSION }}, Pre-release ${{ vars.VERSION_s }} (Nightly)" | ||
| generate_release_notes: true | ||
| files: | | ||
| LICENSE | ||
| ChangeLog.md | ||
| build/libs/**.jar | ||
| if-no-files-found: error | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,25 @@ | ||
| name: publish | ||
| on: [workflow_dispatch] # Manual trigger | ||
| name: Publish package to GitHub Packages | ||
| on: | ||
| release: | ||
| types: [created] | ||
| jobs: | ||
| build: | ||
| strategy: | ||
| matrix: | ||
| java: [ 8-jdk ] | ||
| runs-on: ubuntu-20.04 | ||
| container: | ||
| image: eclipse-temurin:${{ matrix.java }} | ||
| options: --user root | ||
| publish: | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| contents: read | ||
| packages: write | ||
| steps: | ||
| - uses: actions/checkout@v1 | ||
| - uses: gradle/wrapper-validation-action@v1 | ||
| - run: ./gradlew publish --stacktrace | ||
| - uses: actions/checkout@v4 | ||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| java-version: '8' | ||
| distribution: 'oracle' | ||
| - name: Validate Gradle wrapper | ||
| uses: gradle/wrapper-validation-action@ccb4328a959376b642e027874838f60f8e596de3 | ||
| - name: Publish package | ||
| uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 | ||
| with: | ||
| arguments: publish | ||
| env: | ||
| MAVEN_PUBLISH_TOKEN: ${{ secrets.MAVEN_PUBLISH_TOKEN }} | ||
| MAVEN_PUBLISH_USERNAME: ${{ secrets.MAVEN_PUBLISH_USERNAME }} | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,6 @@ | ||
| # dev savedir folder | ||
| run/ | ||
|
|
||
| # Compiled class file | ||
| *.class | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.