Skip to content

Commit

Permalink
Merge pull request #234 from GTModpackTeam/tier-update-cicd
Browse files Browse the repository at this point in the history
  • Loading branch information
tier940 authored Feb 10, 2024
2 parents 441c386 + 4be1722 commit 6baedf3
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
run: chmod +x gradlew

- name: Compile the mod
run: ./gradlew --scan assemble
run: ./gradlew --info --scan assemble

- name: Upload Jars
uses: actions/upload-artifact@v4
Expand All @@ -58,14 +58,14 @@ jobs:

- name: Run post-build checks
id: build_mod
run: ./gradlew build
run: ./gradlew --info build

- name: Attempt to make a PR fixing spotless errors
if: ${{ failure() && steps.build_mod.conclusion == 'failure' && github.event_name == 'pull_request' && !github.event.pull_request.draft }}
run: |
git reset --hard
git checkout "${PR_BRANCH}"
./gradlew spotlessApply || exit 1
./gradlew --info spotlessApply || exit 1
git diff --exit-code && exit 1
git config user.name "GitHub Actions"
git config user.email "<>"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/format_java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ jobs:
uses: ./.github/actions/build_setup

- name: Run Spotless Formatting Check with Gradle
run: ./gradlew spotlessCheck
run: ./gradlew --info spotlessCheck
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
run: chmod +x gradlew

- name: Build Project
run: ./gradlew build
run: ./gradlew --info build

- name: Publish to GitHub
uses: softprops/action-gh-release@v1
Expand All @@ -84,12 +84,12 @@ jobs:
CURSEFORGE_PROJECT_ID: "${{ env.CURSEFORGE_PROJECT_ID }}"
CHANGELOG_LOCATION: "${{ env.CHANGELOG_LOCATION }}"
RELEASE_TYPE: "${{ github.event.inputs.release_type }}"
run: ./gradlew curseforge
run: ./gradlew --info curseforge

- name: Publish to Modrinth
env:
MODRINTH_API_KEY: "${{ secrets.MODRINTH_API_KEY }}"
MODRINTH_PROJECT_ID: "${{ env.MODRINTH_PROJECT_ID }}"
CHANGELOG_LOCATION: "${{ env.CHANGELOG_LOCATION }}"
RELEASE_TYPE: "${{ github.event.inputs.release_type }}"
run: ./gradlew modrinth
run: ./gradlew --info modrinth
2 changes: 1 addition & 1 deletion .github/workflows/test_java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ jobs:
uses: ./.github/actions/build_setup

- name: Run Tests with Gradle
run: ./gradlew --scan test
run: ./gradlew --info --scan test
2 changes: 1 addition & 1 deletion .github/workflows/update_buildscript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
uses: ./.github/actions/build_setup

- name: Run Buildscript Updater
run: ./gradlew updateBuildScript
run: ./gradlew --info updateBuildScript

- name: Get New Buildscript Version
id: version-check
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_gradle_cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ jobs:
update-cache: true

- name: Build Project with Gradle
run: ./gradlew assemble
run: ./gradlew --info assemble
4 changes: 1 addition & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,8 @@ deploymentDebug = false
org.gradle.logging.stacktrace = all
# Effectively applies the '--build-cache' flag by default
org.gradle.caching=true
# Effectively applies the '--info' flag by default
org.gradle.console=info
# Effectively applies the '--warning-mode all' flag by default
org.gradle.warning-mode=all
org.gradle.warning.mode=all
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs = -Xmx4G -Dfile.encoding=UTF-8

0 comments on commit 6baedf3

Please sign in to comment.