From 8e02336c444dacdd2fc66e980e9cd15431576c4b Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Wed, 15 Mar 2023 10:30:38 +0100 Subject: [PATCH] Reapply stash --- .github/workflows/build.yml | 12 +++++------- .github/workflows/codeql.yml | 4 ++-- .github/workflows/release-drafter.yml | 2 +- Bukkit/build.gradle.kts | 2 +- Core/build.gradle.kts | 4 ++-- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 63d4bfe1e..d59432ebe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: build on: push: branches: - - v7 + - main jobs: build: if: github.repository_owner == 'IntellectualSites' @@ -28,7 +28,7 @@ jobs: echo "STATUS=release" >> $GITHUB_ENV fi - name: Publish Release - if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}} + if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}} run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository env: ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }} @@ -36,14 +36,13 @@ jobs: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }} - name: Publish Snapshot - if: ${{ runner.os == 'Linux' && env.STATUS != 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v7' }} + if: ${{ runner.os == 'Linux' && env.STATUS != 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main' }} run: ./gradlew publishToSonatype env: ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }} ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }} - name: Publish core javadoc - # if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}} - if: ${{ runner.os == 'Linux' && env.STATUS == 'snapshot' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}} + if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}} uses: cpina/github-action-push-to-another-repository@0a14457bb28b04dfa1652e0ffdfda866d2845c73 env: SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }} @@ -55,8 +54,7 @@ jobs: target-branch: main target-directory: v7/core - name: Publish bukkit javadoc - # if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}} - if: ${{ runner.os == 'Linux' && env.STATUS == 'snapshot' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}} + if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}} uses: cpina/github-action-push-to-another-repository@0a14457bb28b04dfa1652e0ffdfda866d2845c73 # main env: SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }} diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 31f69f613..8b95a38cf 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -1,10 +1,10 @@ name: "CodeQL" on: push: - branches: [ v7 ] + branches: [ main ] pull_request: # The branches below must be a subset of the branches above - branches: [ v7 ] + branches: [ main ] jobs: analyze: diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index bfdc294d6..2ad2264cf 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -2,7 +2,7 @@ name: draft release on: push: branches: - - v6 + - main pull_request: types: [ opened, reopened, synchronize ] pull_request_target: diff --git a/Bukkit/build.gradle.kts b/Bukkit/build.gradle.kts index 0140a4612..4b89438f5 100644 --- a/Bukkit/build.gradle.kts +++ b/Bukkit/build.gradle.kts @@ -102,7 +102,7 @@ tasks { opt.links("https://jd.papermc.io/paper/1.19/") opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString()) opt.links("https://intellectualsites.github.io/plotsquared-javadocs/core/") - opt.links("https://jd.adventure.kyori.net/api/4.12.0/") + opt.links("https://jd.advntr.dev/api/4.12.0/") opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/") opt.links("https://checkerframework.org/api/") opt.isLinkSource = true diff --git a/Core/build.gradle.kts b/Core/build.gradle.kts index 447b6370a..8d48f143b 100644 --- a/Core/build.gradle.kts +++ b/Core/build.gradle.kts @@ -68,8 +68,8 @@ tasks { val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString() val opt = options as StandardJavadocDocletOptions opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/" + libs.worldeditCore.get().versionConstraint.toString()) - opt.links("https://jd.adventure.kyori.net/api/4.12.0/") - opt.links("https://jd.adventure.kyori.net/text-minimessage/4.12.0/") + opt.links("https://jd.advntr.dev/api/4.12.0/") + opt.links("https://jd.advntr.dev/text-minimessage/4.12.0/") opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/") opt.links("https://checkerframework.org/api/") opt.links("https://javadoc.io/doc/com.intellectualsites.informative-annotations/informative-annotations/latest/")