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

modularize buildSrc #27

Merged
merged 40 commits into from
Nov 10, 2024
Merged
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
95a4237
fix caching for CompressJarTask
rhysdh540 Nov 3, 2024
f243a71
remove old comments
rhysdh540 Nov 4, 2024
d9fb8f9
remove old comments
rhysdh540 Nov 4, 2024
744cd62
the great rework
rhysdh540 Nov 4, 2024
a9bede0
no daemon in ci
rhysdh540 Nov 4, 2024
6aea316
better caching i hope
rhysdh540 Nov 4, 2024
474191e
cache `build` folders
rhysdh540 Nov 4, 2024
cdda047
undo the patch thing
rhysdh540 Nov 4, 2024
3d6d7e6
Merge branch 'master' into zumegradle-rewrite
rhysdh540 Nov 5, 2024
2fa2c0e
only cache regular builds, and maybe make it actually work
rhysdh540 Nov 5, 2024
b1577a0
hmm maybe don't setup-java caching
rhysdh540 Nov 5, 2024
e3290b8
Merge branch 'master' into zumegradle-rewrite
rhysdh540 Nov 5, 2024
9bab11f
change artifact globs
rhysdh540 Nov 5, 2024
ac017fb
post merge fixes and stuff
rhysdh540 Nov 5, 2024
cbd422b
cache based on gradle.properties
rhysdh540 Nov 5, 2024
3344803
bump to upload-artifact v4
rhysdh540 Nov 6, 2024
8e49298
Merge remote-tracking branch 'upstream/master' into zumegradle-rewrite
rhysdh540 Nov 6, 2024
ddf649f
merge but correct
rhysdh540 Nov 6, 2024
ff8b6e3
make smoke testing a real task
rhysdh540 Nov 6, 2024
71bb18a
Merge remote-tracking branch 'upstream/master' into zumegradle-rewrite
rhysdh540 Nov 6, 2024
a9e54e7
use gradle dependencies
rhysdh540 Nov 6, 2024
dde44f0
upload test results if they fail
rhysdh540 Nov 6, 2024
38349eb
use modrinth maven for now since legfab is down
rhysdh540 Nov 6, 2024
463d4d8
indent failed tests
rhysdh540 Nov 6, 2024
ee76889
no
rhysdh540 Nov 6, 2024
e01acb4
back to single file
rhysdh540 Nov 7, 2024
ca8baab
Merge remote-tracking branch 'upstream/master' into zumegradle-rewrite
rhysdh540 Nov 7, 2024
24b867d
use modrinth for everything
rhysdh540 Nov 7, 2024
31f0dc7
allow url downloads too
rhysdh540 Nov 7, 2024
6c79edd
cache based on branch name
rhysdh540 Nov 7, 2024
8acc1c5
oops
rhysdh540 Nov 7, 2024
a4948d0
bump fapi
rhysdh540 Nov 7, 2024
d665e74
what
rhysdh540 Nov 7, 2024
6a6076c
use new path apis
rhysdh540 Nov 7, 2024
81f0ad3
maybe this will work idk
rhysdh540 Nov 7, 2024
7fa1245
fix log path
rhysdh540 Nov 7, 2024
6441604
upload setup logs too
rhysdh540 Nov 7, 2024
8904dc9
lazydfu!
rhysdh540 Nov 8, 2024
88f6623
make this one thing look nicer
rhysdh540 Nov 8, 2024
07a4359
remove one tab and comment out smoke test for fabric 1.6.4
rhysdh540 Nov 10, 2024
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
34 changes: 28 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,49 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4

- name: Install Packages
run: sudo apt-get install -y advancecomp

# cache local gradle files, global ones will be taken care of by the setup-gradle action
- uses: actions/cache@v4
with:
path: |
**/.gradle/
**/build/
key: ${{ runner.os }}-gradlelocal-${{ hashFiles('gradle.properties', '**/gradle-wrapper.properties') }}
rhysdh540 marked this conversation as resolved.
Show resolved Hide resolved

- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 21

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
with:
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}

- name: :build
run: ./gradlew build --stacktrace
run: ./gradlew build --stacktrace --no-daemon

- name: :smokeTest
id: smokeTest
uses: coactions/setup-xvfb@v1
with:
run: ./gradlew :smokeTest
run: ./gradlew :smokeTest --no-daemon

- name: Upload artifacts
uses: actions/upload-artifact@v3
if: always()
uses: actions/upload-artifact@v4
with:
name: zume
path: |
**/zume-*.jar
**/*mappings.txt
build/smoke_test/**/*.log
**/build/libs/zume*.jar
build/libs/*mappings.txt

- name: Upload test results
if: ${{ steps.smokeTest.outcome == 'failure' }}
uses: actions/upload-artifact@v4
with:
name: smokeTest
path: build/smokeTest/**/logs/**
6 changes: 3 additions & 3 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ jobs:
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY_PR }}
cache-read-only: true
- name: :build
run: ./gradlew build
run: ./gradlew build --no-daemon
- name: :smokeTest
uses: coactions/setup-xvfb@v1
with:
run: ./gradlew :smokeTest
run: ./gradlew :smokeTest --no-daemon
- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: zume
path: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
with:
run: ./gradlew :smokeTest
- name: :publishMods
run: ./gradlew publishMods -Prelease_channel=RELEASE
run: ./gradlew publishMods -Prelease_channel=RELEASE --no-daemon
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
cache-read-only: true
- name: :publishMods
run: ./gradlew publishMods -Prelease_channel=DEV_BUILD --stacktrace
run: ./gradlew publishMods -Prelease_channel=DEV_BUILD --stacktrace --no-daemon
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DISCORD_WEBHOOK: ${{ secrets.DISCORD_DEV_WEBHOOK }}
2 changes: 1 addition & 1 deletion .github/workflows/release_pre.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
cache-read-only: true
- name: :publishMods
run: ./gradlew publishMods -Prelease_channel=PRE_RELEASE
run: ./gradlew publishMods -Prelease_channel=PRE_RELEASE --no-daemon
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DISCORD_WEBHOOK: ${{ secrets.DISCORD_DEV_WEBHOOK }}
2 changes: 1 addition & 1 deletion .github/workflows/release_rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
cache-read-only: true
- name: :publishMods
run: ./gradlew publishMods -Prelease_channel=RELEASE_CANDIDATE
run: ./gradlew publishMods -Prelease_channel=RELEASE_CANDIDATE --no-daemon
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DISCORD_WEBHOOK: ${{ secrets.DISCORD_DEV_WEBHOOK }}
Loading
Loading