Skip to content

Commit

Permalink
Merge branch 'refs/heads/dev/1.19.2' into dev/1.20.1
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/build-and-test.yaml
#	src/main/java/de/srendi/advancedperipherals/common/commands/APCommands.java
#	src/main/java/de/srendi/advancedperipherals/common/util/ChunkManager.java
  • Loading branch information
SirEndii committed Apr 22, 2024
2 parents 42757d7 + d7fc90a commit a102aa5
Showing 1 changed file with 12 additions and 24 deletions.
36 changes: 12 additions & 24 deletions .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
name: build-and-test
run-name: Build and test the changes
on: [push, pull_request, workflow_dispatch]
name: Build and Test

on:
workflow_dispatch:
push:
pull_request_target:
types:
- opened
- synchronize

jobs:
test:
name: Test
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v4
- name: Setup Gradle
uses: gradle/gradle-build-action@v3
- name: Build with Gradle
run: ./gradlew check
build:
name: Build
runs-on: ubuntu-latest
needs: test
steps:
- name: Checkout sources
uses: actions/checkout@v4
- name: Setup Gradle
uses: gradle/gradle-build-action@v3
- name: Build with Gradle
run: ./gradlew build
build-and-test:
uses: IntelligenceModding/actions/.github/workflows/build-and-test.yaml@master

0 comments on commit a102aa5

Please sign in to comment.