Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release #59

Merged
merged 27 commits into from
Dec 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ jobs:
with:
fetch-depth: 0
- name: Set up JDK 17
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: '17'
java-version-file: .java-version
distribution: 'temurin'
- id: get_last_version
name: Get last version
Expand All @@ -51,12 +51,15 @@ jobs:
name: Reset bump level
run: |
echo "patch" > .release-info/${{ github.ref_name }}/BUMP_LEVEL
- name: Build with Gradle
uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7
with:
arguments: build test --console=verbose
- name: Wrapper validation
uses: gradle/actions/wrapper-validation@v4
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
- name: Build and test
env:
MOD_VERSION: "${{ steps.bump_version.outputs.new_version }}"
run: |
./gradlew build test --console=verbose
- name: Commit version file
run: |
git config --global user.email "[email protected]"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ name: "CodeQL"

on:
push:
branches: [ 1.18, 1.19, 1.20 ]
branches: [ 1.16, 1.18, 1.19, 1.20, 1.21 ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ 1.18, 1.19, 1.20 ]
branches: [ 1.16, 1.18, 1.19, 1.20, 1.21 ]
schedule:
- cron: '17 11 * * 3'

Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/debug.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
name: Debug

on:
create:
tags:
- '*'
release:
types:
- published
- created
push:
branches:
- '*'
tags:
- '*'

jobs:
debug:
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/pr-build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name: PR (Release)

on:
pull_request:
branches: [ "1.18-release", "1.19-release", "1.20-release" ]
branches: [ "1.16-release", "1.18-release", "1.19-release", "1.20-release", "1.21-release" ]
paths:
- 'src/**'
- 'test/**'
Expand All @@ -27,11 +27,12 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: '17'
java-version-file: .java-version
distribution: 'temurin'
- name: Build with Gradle
uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7
with:
arguments: build test --console=verbose
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
- name: Build and test
run: |
./gradlew build test --console=verbose
17 changes: 9 additions & 8 deletions .github/workflows/pr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: PR

on:
pull_request:
branches: [ "1.18", "1.19", "1.20" ]
branches: [ "1.16", "1.18", "1.19", "1.20", "1.21" ]
paths:
- 'src/**'
- 'test/**'
Expand All @@ -22,12 +22,13 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK 17
uses: actions/setup-java@v2
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: '17'
java-version-file: .java-version
distribution: 'temurin'
- name: Build with Gradle
uses: gradle/[email protected]
with:
arguments: build test --console=verbose
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
- name: Build and test
run: |
gradle build test --console=verbose
21 changes: 11 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name: Release

on:
push:
branches: [ "1.18-release", "1.19-release", "1.20-release" ]
branches: [ "1.16-releae", "1.18-release", "1.19-release", "1.20-release", "1.21-release" ]
paths:
- 'src/**'
- 'test/**'
Expand All @@ -33,35 +33,36 @@ jobs:
with:
java-version-file: '.java-version'
distribution: 'temurin'
- name: Build with Gradle
uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
- name: Build and test
env:
CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }}
MODRINTH_API_KEY: ${{ secrets.MODRINTH_API_KEY }}
with:
arguments: curseforge modrinth --console=verbose
run: |
./gradlew curseforge modrinth --console=verbose
- name: Commit hash file and reset changelog
run: |
git config --global user.email "[email protected]"
git config --global user.name "SweetRPG CI"

branch_version=$(echo ${{ github.ref_name }} | cut -f1 -d-)

echo "${{ github.sha }}" > .release-info/${branch_version}/RELEASE_HASH
git add .release-info/${branch_version}/RELEASE_HASH
git commit -m "Update ${branch_version} RELEASE_HASH"
version=$(cat .release-info/${branch_version}/VERSION)
git tag "release-${version}"

echo "# $version" > CHANGELOG/${branch_version}/${version}.md
echo "" >> CHANGELOG/${branch_version}/${version}.md
cat CHANGELOG/${branch_version}/current.md >> CHANGELOG/${branch_version}/${version}.md
cat /dev/null > CHANGELOG/${branch_version}/current.md
git add CHANGELOG/${branch_version}
git commit -m "Reset ${branch_version} changelog"

git push origin --tags

git checkout ${branch_version}
git merge ${{ github.ref_name }}
git push origin
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ logs
forge*changelog.txt
/src/generated/resources/.cache/
.DS_Store
*.java-ish
3 changes: 0 additions & 3 deletions .idea/.gitignore

This file was deleted.

2 changes: 2 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/runConfigurations/client.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .idea/runConfigurations/data.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading