Skip to content

Commit

Permalink
Merge branch 'main' into mapdata-part-2
Browse files Browse the repository at this point in the history
  • Loading branch information
@magicus
magicus committed May 13, 2024
2 parents f795825 + 4c84325 commit 9891c60
Show file tree
Hide file tree
Showing 481 changed files with 18,714 additions and 2,991 deletions.
38 changes: 23 additions & 15 deletions .github/workflows/alpha-release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,77 +16,85 @@ jobs:
changelog: ${{ steps.changelog.outputs.changelog }}
release_id: ${{ steps.release.outputs.id }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.PRIVATE_TOKEN }}

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 16
- run: npm install conventional-changelog-conventionalcommits
- run: |
npm install conventional-changelog-conventionalcommits@7.0.2
npm install conventional-recommended-bump@9.0.0
- name: Set up version.json
run: echo "{"version":$(git describe --tags --abbrev=0)}" > version.json

- name: Create changelog
id: changelog
uses: TriPSs/conventional-changelog-action@v3.17.0
uses: TriPSs/conventional-changelog-action@v5.2.1
with:
github-token: ${{ secrets.PRIVATE_TOKEN }}
git-user-name: 'WynntilsBot'
git-user-email: 'admin@wynntils.com'
pre-commit: ./.github/.pre-commit.js
config-file-path: ./.github/.config.js
version-file: ./version.json
skip-version-file: true
skip-git-pull: true
pre-release: true
pre-release-identifier: alpha
release-count: 5

- name: Create release
if: ${{ steps.changelog.outputs.skipped != 'true' }}
id: release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
tag_name: ${{ steps.changelog.outputs.tag }}
body: ${{ steps.changelog.outputs.changelog }}
draft: true
prerelease: true

- name: Upload version information
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build
path: build.gradle
overwrite: true

build:
name: Build
needs: [changelog] # Build needs the new version number
needs: [ changelog ] # Build needs the new version number
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Cache Gradle data
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: .gradle
key: ${{ runner.os }}-gradle--${{ hashFiles('**/settings.gradle', '**/gradle.properties') }}

- uses: actions/download-artifact@v3 # Download version information from changelog
- uses: actions/download-artifact@v4 # Download version information from changelog
with:
name: build

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: 17
cache: "gradle"

- name: Build with Gradle
uses: gradle/gradle-build-action@v2
uses: gradle/actions/setup-gradle@v3
with:
arguments: buildDependents -x spotlessCheck -x test

- name: Upload files to release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
if: ${{ needs.changelog.outputs.skipped != 'true' }}
with:
tag_name: ${{ needs.changelog.outputs.tag }}
Expand All @@ -100,10 +108,10 @@ jobs:
name: Release Github
if: ${{ needs.changelog.outputs.skipped != 'true' }}
runs-on: ubuntu-latest
needs: [build, changelog]
needs: [ build, changelog ]
steps:
- name: Publish Release
uses: eregon/publish-release@v1
uses: eregon/publish-release@v1.0.6
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/autopromote.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: merge
uses: mtanzi/action-automerge@v1
id: merge
Expand All @@ -28,7 +28,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: merge
uses: mtanzi/action-automerge@v1
id: merge
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,45 +13,45 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out source code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ github.event.pull_request.head.repo.full_name }}
token: ${{ secrets.PRIVATE_TOKEN }}
ref: ${{ github.head_ref }}
fetch-depth: 0

- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: 17

- name: Cache Gradle data
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: .gradle
key: ${{ runner.os }}-gradle--${{ hashFiles('**/settings.gradle', '**/gradle.properties') }}

- name: Format with spotless
uses: gradle/gradle-build-action@v2
uses: gradle/actions/setup-gradle@v3
with:
arguments: spotlessApply

- name: Delete empty files
run: find $(git ls-files -m) -size 0 -delete

- uses: stefanzweifel/git-auto-commit-action@v4
- uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_user_name: 'WynntilsBot'
commit_user_email: 'admin@wynntils.com'
commit_message: 'ci: spotless formatting'

- name: Build with Gradle
uses: gradle/gradle-build-action@v2
uses: gradle/actions/setup-gradle@v3
with:
arguments: buildDependents -x spotlessCheck -x test

- name: Test with Gradle
uses: gradle/gradle-build-action@v2
uses: gradle/actions/setup-gradle@v3
with:
arguments: test -x spotlessCheck
26 changes: 0 additions & 26 deletions .github/workflows/qodana.yml.disabled
View file

This file was deleted.

37 changes: 19 additions & 18 deletions .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@ jobs:
changelog: ${{ steps.changelog.outputs.changelog }}
release_id: ${{ steps.release.outputs.id }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.PRIVATE_TOKEN }}

- name: Set up version.json
run: echo "{"version":$(git describe --tags --abbrev=0)}" > version.json

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 16
- run: |
npm install conventional-changelog-conventionalcommits
npm install conventional-recommended-bump
npm install conventional-changelog-conventionalcommits@7.0.2
npm install conventional-recommended-bump@9.0.0
- name: Set up version.json
run: echo "{"version":$(git describe --tags --abbrev=0)}" > version.json

- name: Create changelog
id: changelog
Expand All @@ -49,15 +49,15 @@ jobs:
- name: Create release
if: ${{ steps.changelog.outputs.skipped != 'true' }}
id: release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
tag_name: ${{ steps.changelog.outputs.tag }}
body: ${{ steps.changelog.outputs.clean_changelog }}
draft: true
prerelease: false

- name: Upload version information
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build
path: build.gradle
Expand All @@ -67,32 +67,32 @@ jobs:
needs: [changelog] # Build needs the new version number
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Cache Gradle data
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: .gradle
key: ${{ runner.os }}-gradle--${{ hashFiles('**/settings.gradle', '**/gradle.properties') }}

- uses: actions/download-artifact@v3 # Download version information from changelog
- uses: actions/download-artifact@v4 # Download version information from changelog
with:
name: build

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: 17
cache: "gradle"

- name: Build with Gradle
uses: gradle/gradle-build-action@v2
uses: gradle/actions/setup-gradle@v3
with:
arguments: buildDependents -x spotlessCheck -x test

- name: Upload files to release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
if: ${{ needs.changelog.outputs.skipped != 'true' }}
with:
tag_name: ${{ needs.changelog.outputs.tag }}
Expand All @@ -103,13 +103,14 @@ jobs:
**/build/libs/*-forge+MC-*.jar
- name: Upload build
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build
path: |
**/build/libs/*-fabric+MC-*.jar
**/build/libs/*-forge+MC-*.jar
if-no-files-found: error
overwrite: true

release:
name: Release to Modrinth and CurseForge
Expand All @@ -120,7 +121,7 @@ jobs:
runs-on: ubuntu-latest
needs: [build, changelog]
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build

Expand Down Expand Up @@ -153,7 +154,7 @@ jobs:
needs: [build, changelog]
steps:
- name: Publish Release
uses: eregon/publish-release@v1
uses: eregon/publish-release@v1.0.6
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-urls.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out source code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ github.event.pull_request.head.repo.full_name }}
token: ${{ secrets.PRIVATE_TOKEN }}
Expand All @@ -22,7 +22,7 @@ jobs:
wget -O common/src/main/resources/assets/wynntils/urls.json "https://raw.githubusercontent.com/Wynntils/Static-Storage/main/Data-Storage/urls.json"
- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@v6
with:
labels: auto-generated
committer: 'WynntilsBot <admin@wynntils.com>'
Expand Down
Loading

0 comments on commit 9891c60

Please sign in to comment.