Skip to content

Commit

Permalink
Merge branch 'refs/heads/master' into 1.19.3
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/gradle.yml
#	.github/workflows/publish.yml
  • Loading branch information
Jerozgen committed May 12, 2024
2 parents a764c50 + 60e57b6 commit 93a659b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
name: Java CI

on: [pull_request]
on: [pull_request, workflow_dispatch]

jobs:
build:
name: Build
runs-on: ubuntu-latest
if: "! contains(toJSON(github.event.head_commit.message), '[Skip CI]')"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1
uses: gradle/wrapper-validation-action@v2

- name: Grant execute permission for gradlew
run: chmod +x gradlew
Expand All @@ -26,7 +26,7 @@ jobs:
run: ./gradlew build

- name: Upload build artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Language Reload
path: build/libs
8 changes: 4 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ jobs:
upload:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1
uses: gradle/wrapper-validation-action@v2

- name: Grant execute permission for gradlew
run: chmod +x gradlew
Expand All @@ -27,7 +27,7 @@ jobs:
run: ./gradlew build

- name: Upload build artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Language Reload
path: build/libs
Expand Down

0 comments on commit 93a659b

Please sign in to comment.