diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4bd71a2..c297e57 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,11 +30,12 @@ jobs: with: path: javadoc ref: gh-pages + token: ${{ secrets.GH_PAT }} - name: Validate Gradle Wrapper uses: gradle/wrapper-validation-action@v1 - - name: Set up GraalVM ${{ matrix.jdk }} + - name: Set up GraalVM ${{ matrix.base_jdk }} uses: graalvm/setup-graalvm@v1 with: github-token: ${{ secrets.GH_PAT }} @@ -64,7 +65,7 @@ jobs: (cd Plazma-API/build/docs/javadoc && tar c .) | (cd javadoc && tar xf -) cd javadoc git add . && git commit -m "Update Javadocs" - git push https://${{ secrets.GH_PAT }}@github.com/PlazmaMC/Plazma.git -f + git push - name: Publish Packages if: github.ref_name == env.MAIN_BRANCH diff --git a/.github/workflows/close-invalid-prs.yml b/.github/workflows/close-invalid-prs.yml new file mode 100644 index 0000000..62d0fdd --- /dev/null +++ b/.github/workflows/close-invalid-prs.yml @@ -0,0 +1,14 @@ +name: Close invalid PRs + +on: + pull_request_target: + types: [ opened ] + +jobs: + run: + if: ${{ github.repository != github.event.pull_request.head.repo.full_name && !startsWith(github.head_ref, 'ver/') }} + runs-on: ubuntu-22.04 + steps: + - uses: superbrothers/close-pull-request@v3 + with: + comment: "Please do not open pull requests from the `master` branch, create a new branch instead." diff --git a/.github/workflows/check.yml b/.github/workflows/gradle.yml similarity index 74% rename from .github/workflows/check.yml rename to .github/workflows/gradle.yml index 7402860..4657bfc 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/gradle.yml @@ -9,8 +9,8 @@ jobs: release: strategy: matrix: - base_jdk: [19] - graal: [latest] + jdk: [19.0.2+7] + java: ['temurin'] os: [ubuntu-22.04] if: "!contains(github.event.commits[0].message, '[CheckSkip]')" @@ -22,12 +22,11 @@ jobs: - name: Validate Gradle Wrapper uses: gradle/wrapper-validation-action@v1 - - name: Set up GraalVM ${{ matrix.jdk }} - uses: graalvm/setup-graalvm@v1 + - name: Set up JDK ${{ matrix.java }} ${{ matrix.jdk }} + uses: actions/setup-java@v3 with: - github-token: ${{ secrets.GH_PAT }} - java-version: ${{ matrix.base_jdk }} - version: ${{ matrix.graal }} + distribution: ${{ matrix.java }} + java-version: ${{ matrix.jdk }} cache: 'gradle' - name: Configure Git diff --git a/.github/workflows/build_javadoc.yml b/.github/workflows/javadocs.yml similarity index 100% rename from .github/workflows/build_javadoc.yml rename to .github/workflows/javadocs.yml