Skip to content

Commit

Permalink
Merge branch 'GregTechCEu:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
marisathewitch authored Jul 6, 2024
2 parents d08269e + f7ad0bc commit 11aab6c
Show file tree
Hide file tree
Showing 121 changed files with 1,839 additions and 378 deletions.
2 changes: 1 addition & 1 deletion .github/actions/build_setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ runs:
java-version: 17

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
uses: gradle/actions/setup-gradle@v3
with:
cache-write-only: ${{ inputs.update-cache }}
generate-job-summary: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
run: ./gradlew build --warning-mode all --build-cache

- name: Publish to GitHub
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
files: "build/libs/*.jar"
generate_release_notes: true
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/test_java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@ on:
push:
branches:
- master
paths: ['src/main/java/**', 'src/test/**', 'src/api/java/**', 'gradle/**', '**.gradle', 'gradle.properties',
'gradlew**', 'src/main/resources/*_at.cfg']
pull_request:
paths: ['src/main/java/**', 'src/test/**', 'src/api/java/**', 'gradle/**', '**.gradle', 'gradle.properties',
'gradlew**', 'src/main/resources/*_at.cfg']
branches:
- '*'

concurrency:
group: tests-${{ github.head_ref || github.ref }}
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/update_buildscript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,11 @@ jobs:
- name: Create Pull Request
id: create-pull-request
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@v6
env:
GITHUB_TOKEN: ${{ secrets.BUILDSCRIPT_UPDATER_TOKEN }}
with:
token: ${{ secrets.BUILDSCRIPT_UPDATER_TOKEN }}
committer: GitHub <[email protected]>
author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
commit-message: 'update build script version to ${{ steps.version-check.outputs.NEW_VERSION }}'
branch: gha-update-buildscript
title: Update build script version to ${{ steps.version-check.outputs.NEW_VERSION }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/validate_gradle_wrapper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ jobs:
uses: actions/checkout@v4

- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1
uses: gradle/actions/wrapper-validation
Loading

0 comments on commit 11aab6c

Please sign in to comment.