diff --git a/plugins/finale-paper/.github/workflows/build.yml b/plugins/finale-paper/.github/workflows/build.yml new file mode 100644 index 000000000..8a5b08ede --- /dev/null +++ b/plugins/finale-paper/.github/workflows/build.yml @@ -0,0 +1,24 @@ +name: Build + +on: + push: + branches: + - '*' + pull_request: + types: [opened, synchronize, reopened] + +jobs: + build: + name: Build + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: temurin + + - uses: gradle/gradle-build-action@v2 + with: + arguments: build diff --git a/plugins/finale-paper/.github/workflows/publish.yml b/plugins/finale-paper/.github/workflows/publish.yml new file mode 100644 index 000000000..0a5f55f34 --- /dev/null +++ b/plugins/finale-paper/.github/workflows/publish.yml @@ -0,0 +1,25 @@ +name: Publish + +on: + push: + tags: + - 'v*.*.*' + +jobs: + publish: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: temurin + + - uses: gradle/gradle-build-action@v2 + with: + arguments: publish + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + CIVMC_NEXUS_USER: ${{ secrets.CIVMC_NEXUS_USER }} + CIVMC_NEXUS_PASSWORD: ${{ secrets.CIVMC_NEXUS_PASSWORD }} \ No newline at end of file diff --git a/plugins/finale-paper/.github/workflows/pull_request.yml b/plugins/finale-paper/.github/workflows/pull_request.yml deleted file mode 100644 index 042464808..000000000 --- a/plugins/finale-paper/.github/workflows/pull_request.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: Build -on: - pull_request: - -jobs: - call_build: - uses: CivMC/.github/.github/workflows/gradle_build.yml@master diff --git a/plugins/finale-paper/.github/workflows/release_created.yml b/plugins/finale-paper/.github/workflows/release_created.yml deleted file mode 100644 index 5bbdc60db..000000000 --- a/plugins/finale-paper/.github/workflows/release_created.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: Publish -on: - release: - types: [created] - -jobs: - call_publish: - uses: CivMC/.github/.github/workflows/gradle_publish.yml@master diff --git a/plugins/finale-paper/build.gradle.kts b/plugins/finale-paper/build.gradle.kts index 818862361..5a7bb9435 100644 --- a/plugins/finale-paper/build.gradle.kts +++ b/plugins/finale-paper/build.gradle.kts @@ -4,12 +4,6 @@ plugins { id("net.civmc.civgradle") version "2.+" apply false } -// Temporary hack: -// Remove the root build directory -gradle.buildFinished { - project.buildDir.deleteRecursively() -} - subprojects { apply(plugin = "java-library") apply(plugin = "maven-publish") @@ -24,15 +18,4 @@ subprojects { maven("https://repo.civmc.net/repository/maven-public") maven("https://repo.dmulloy2.net/content/groups/public/") } - - repositories { - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/CivMC/Finale") - credentials { - username = System.getenv("GITHUB_ACTOR") - password = System.getenv("GITHUB_TOKEN") - } - } - } } diff --git a/plugins/finale-paper/settings.gradle.kts b/plugins/finale-paper/settings.gradle.kts index 843c40f35..d15ac4b4a 100644 --- a/plugins/finale-paper/settings.gradle.kts +++ b/plugins/finale-paper/settings.gradle.kts @@ -3,14 +3,8 @@ rootProject.name = "finale" pluginManagement { repositories { gradlePluginPortal() + maven("https://repo.civmc.net/repository/maven-public/") maven("https://papermc.io/repo/repository/maven-public/") - maven { - url = uri("https://maven.pkg.github.com/CivMC/CivGradle") - credentials { - username = System.getenv("GITHUB_ACTOR") - password = System.getenv("GITHUB_TOKEN") - } - } } }