diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b8faa362d..e41659c51 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,21 +15,22 @@ jobs: release: strategy: matrix: - base_jdk: [17] + base_jdk: [21] graal: [latest] os: [ubuntu-22.04] if: "!startsWith(github.event.commits[0].message, '[CI-Skip]')" runs-on: ${{ matrix.os }} steps: - - name: Checkout action - uses: actions/checkout@v3 + - name: Checkout repository + uses: actions/checkout@v4 - - name: Checkout pages - uses: actions/checkout@v3 + - name: Checkout javadocs + uses: actions/checkout@v4 with: + repository: PlazmaMC/Javadocs path: javadoc - ref: gh-pages + ref: main token: ${{ secrets.GH_PAT }} - name: Validate Gradle Wrapper diff --git a/.github/workflows/javadocs.yml b/.github/workflows/javadocs.yml deleted file mode 100644 index 93742fc6c..000000000 --- a/.github/workflows/javadocs.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: Deploy Javadocs - -on: - push: - branches: ["gh-pages"] - workflow_dispatch: - -permissions: - contents: read - pages: write - id-token: write - -concurrency: - group: "pages" - cancel-in-progress: true - -jobs: - build: - if: "!startsWith(github.event.commits[0].message, '[CI-Skip]')" - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Setup Pages - uses: actions/configure-pages@v3 - - - name: Build with Jekyll - uses: actions/jekyll-build-pages@v1 - with: - source: ./ - destination: ./_site - - - name: Upload artifact - uses: actions/upload-pages-artifact@v1 - - deploy: - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - runs-on: ubuntu-latest - needs: build - steps: - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index 47e0781ec..000000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: Test build with Normal JDK - -on: - push: - branches: [ "ver/*", "feat/*", "dev/*", "expr/*", "ench/*", "impl/*" ] - workflow_dispatch: - -jobs: - release: - strategy: - matrix: - jdk: [19.0.2+7] - java: ['temurin'] - os: [ubuntu-22.04] - - if: "!startsWith(github.event.commits[0].message, '[CI-Skip]')" - runs-on: ${{ matrix.os }} - steps: - - name: Checkout action - uses: actions/checkout@v3 - - - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 - - - name: Set up JDK ${{ matrix.java }} ${{ matrix.jdk }} - uses: actions/setup-java@v3 - with: - distribution: ${{ matrix.java }} - java-version: ${{ matrix.jdk }} - cache: 'gradle' - - - name: Test build - run: | - git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" && git config --global user.name "github-actions[bot]" - ./gradlew applyPatches --stacktrace - ./gradlew build --stacktrace