Skip to content

Commit

Permalink
Merge remote-tracking branch 'meteor/master' into master-ame
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/builds/index.js
#	.github/builds/package.json
#	.github/workflows/build.yml
#	.github/workflows/pull-request.yml
#	build.gradle
#	gradle/wrapper/gradle-wrapper.jar
#	gradlew
#	gradlew.bat
#	settings.gradle.kts
#	src/main/java/meteordevelopment/meteorclient/MeteorClient.java
#	src/main/java/meteordevelopment/meteorclient/mixin/CrashReportMixin.java
#	src/main/java/meteordevelopment/meteorclient/systems/modules/misc/DiscordPresence.java
#	src/main/java/meteordevelopment/meteorclient/utils/misc/MeteorStarscript.java
#	src/main/resources/fabric.mod.json
  • Loading branch information
JFronny committed Jan 8, 2025
2 parents 3d6fe4e + 3819e27 commit 6daeb1d
Show file tree
Hide file tree
Showing 10 changed files with 244 additions and 195 deletions.
34 changes: 21 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,30 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
- name: Checkout Repository
uses: actions/checkout@v4
with:
persist-credentials: false

- name: Set up Gradle
uses: gradle/actions/setup-gradle@v4
with:
gradle-version: current

- name: Set up Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
with:
gradle-version: current
- name: Build with Gradle

- name: Build
run: gradle build -Pcommit=${{ github.sha }}

- uses: "marvinpinto/action-automatic-releases@latest"
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
automatic_release_tag: "latest-1.21.4"
prerelease: false
title: "1.21.4 Build"
files: |
./build/libs/*.jar
repo_token: "${{ secrets.GITHUB_TOKEN }}"
automatic_release_tag: "latest-1.21.4"
prerelease: false
title: "1.21.4 Build"
files: |
./build/libs/*.jar
7 changes: 5 additions & 2 deletions .github/workflows/issue-moderator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ jobs:
issue-moderator:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Checkout Repository
uses: actions/checkout@v4
with:
persist-credentials: false

- name: Automatically close issues that don't follow the issue template
uses: lucasbento/[email protected]
with:
Expand All @@ -20,4 +24,3 @@ jobs:
@${issue.user.login}: hello! :wave:
This issue is being automatically closed because it does not follow the issue template."
closed-issues-label: "invalid"

23 changes: 15 additions & 8 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,27 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- name: Checkout Repository
uses: actions/checkout@v4
with:
persist-credentials: false

- name: Set up Gradle
uses: gradle/actions/setup-gradle@v4
with:
gradle-version: current

- name: Set up Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'

- name: Run Gradle
uses: gradle/gradle-build-action@v2
with:
gradle-version: current
arguments: build
- name: Build
run: gradle build

- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: pull-request-build
path: build/libs/
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ out
run
bin
logs
.github/devbuilds/node_modules
.github/builds/node_modules
*.iws
*.ipr
*.iml
Expand Down
164 changes: 0 additions & 164 deletions build.gradle

This file was deleted.

Loading

0 comments on commit 6daeb1d

Please sign in to comment.