diff --git a/.github/workflows/Push.yml b/.github/workflows/Build.yml similarity index 87% rename from .github/workflows/Push.yml rename to .github/workflows/Build.yml index 1a68ff6..313956d 100644 --- a/.github/workflows/Push.yml +++ b/.github/workflows/Build.yml @@ -1,5 +1,5 @@ -name: Build Push Changes -on: [push, workflow_dispatch] +name: Build Mod +on: [push, pull_request, workflow_dispatch] jobs: build: @@ -8,7 +8,7 @@ jobs: - uses: actions/checkout@v4 - name: Set Android SDK tools - run: echo "$ANDROID_HOME/build-tools/30.0.3" >> $GITHUB_PATH + run: echo "$ANDROID_HOME/build-tools/34.0.0" >> $GITHUB_PATH - name: Set up JDK 17 uses: actions/setup-java@v4 diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index 0660354..8c5c492 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v4 - name: Set Android SDK tools - run: echo "$ANDROID_HOME/build-tools/30.0.3" >> $GITHUB_PATH + run: echo "$ANDROID_HOME/build-tools/34.0.0" >> $GITHUB_PATH - name: Set up JDK 17 uses: actions/setup-java@v4 diff --git a/.github/workflows/TestBuildWhenPullRequest.yml b/.github/workflows/TestBuildWhenPullRequest.yml deleted file mode 100644 index 5c03511..0000000 --- a/.github/workflows/TestBuildWhenPullRequest.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: Pull Request Testing - -on: [ pull_request ] - -jobs: - buildJar: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - name: Set up PATH - run: | - echo "${ANDROID_HOME}/build-tools/30.0.1" >> $GITHUB_PATH - - name: Set up JDK 17 - uses: actions/setup-java@v4 - with: - java-version: 17 - distribution: 'temurin' - cache: 'gradle' - - - name: Setup gradle - run: | - chmod +x gradlew - - - name: MultiCrafter unit test - run: | - ./gradlew :lib:test - - - name: Build MultiCrafter - run: | - ./gradlew :main:deploy - ./gradlew distInjection - - - uses: actions/upload-artifact@v3 - with: - name: MultiCrafterMod - path: main/build/tmp/deploy/*.jar - - - uses: actions/upload-artifact@v3 - with: - name: MultiCrafterLibDist - path: build/tmp/distInjection/*.zip \ No newline at end of file