Skip to content

Commit

Permalink
Merge pull request #124 from Shynixn/development
Browse files Browse the repository at this point in the history
Merge changes to master --release
  • Loading branch information
Shynixn authored Aug 6, 2024
2 parents 680c2c4 + 01b85bd commit c7de1e8
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 58 deletions.
35 changes: 1 addition & 34 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Build Java Application
run: |
chmod +x gradlew
./gradlew clean build shadowJar
./gradlew clean build
- name: Publish Release to Maven Central
if: "contains(github.event.head_commit.message, '--release') && contains(github.ref, 'master')"
Expand Down Expand Up @@ -82,17 +82,6 @@ jobs:
asset_name: MCCoroutine-Bukkit-Core.jar
asset_content_type: application/jar

- name: Upload Bukkit Sampe Plugin to Github
if: "contains(github.event.head_commit.message, '--release') && contains(github.ref, 'master')"
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: /home/runner/work/MCCoroutine/MCCoroutine/mccoroutine-bukkit-sample/build/libs/mccoroutine-bukkit-sample-${{ env.RELEASE_VERSION }}.jar
asset_name: MCCoroutine-Bukkit-Plugin-Sample.jar
asset_content_type: application/jar

- name: Upload Sponge Api to Github
if: "contains(github.event.head_commit.message, '--release') && contains(github.ref, 'master')"
uses: actions/upload-release-asset@v1
Expand All @@ -115,17 +104,6 @@ jobs:
asset_name: MCCoroutine-Sponge-Core.jar
asset_content_type: application/jar

- name: Upload Sponge Sample Plugin to Github
if: "contains(github.event.head_commit.message, '--release') && contains(github.ref, 'master')"
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: /home/runner/work/MCCoroutine/MCCoroutine/mccoroutine-sponge-sample/build/libs/mccoroutine-sponge-sample-${{ env.RELEASE_VERSION }}.jar
asset_name: MCCoroutine-Sponge-Plugin-Sample.jar
asset_content_type: application/jar

- name: Upload BungeeCord Api to Github
if: "contains(github.event.head_commit.message, '--release') && contains(github.ref, 'master')"
uses: actions/upload-release-asset@v1
Expand All @@ -148,17 +126,6 @@ jobs:
asset_name: MCCoroutine-BungeeCord-Core.jar
asset_content_type: application/jar

- name: Upload BungeeCord Sample Plugin to Github
if: "contains(github.event.head_commit.message, '--release') && contains(github.ref, 'master')"
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: /home/runner/work/MCCoroutine/MCCoroutine/mccoroutine-bungeecord-sample/build/libs/mccoroutine-bungeecord-sample-${{ env.RELEASE_VERSION }}.jar
asset_name: MCCoroutine-BungeeCord-Plugin-Sample.jar
asset_content_type: application/jar

- name: Upload Velocity Api to Github
if: "contains(github.event.head_commit.message, '--release') && contains(github.ref, 'master')"
uses: actions/upload-release-asset@v1
Expand Down
6 changes: 0 additions & 6 deletions mccoroutine-bukkit-sample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@ plugins {
id("com.github.johnrengelman.shadow") version ("8.1.1")
}

publishing {
publications {
(findByName("mavenJava") as MavenPublication).artifact(tasks.findByName("shadowJar")!!)
}
}

tasks.withType<ShadowJar> {
dependsOn("jar")
archiveClassifier.set("shadowJar")
Expand Down
6 changes: 0 additions & 6 deletions mccoroutine-bungeecord-sample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@ plugins {
id("com.github.johnrengelman.shadow") version ("8.1.1")
}

publishing {
publications {
(findByName("mavenJava") as MavenPublication).artifact(tasks.findByName("shadowJar")!!)
}
}

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
Expand Down
6 changes: 0 additions & 6 deletions mccoroutine-folia-sample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@ plugins {
id("com.github.johnrengelman.shadow") version ("8.1.1")
}

publishing {
publications {
(findByName("mavenJava") as MavenPublication).artifact(tasks.findByName("shadowJar")!!)
}
}

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(17))
Expand Down
6 changes: 0 additions & 6 deletions mccoroutine-sponge-sample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@ plugins {
id("com.github.johnrengelman.shadow") version ("8.1.1")
}

publishing {
publications {
(findByName("mavenJava") as MavenPublication).artifact(tasks.findByName("shadowJar")!!)
}
}

tasks.withType<ShadowJar> {
dependsOn("jar")
archiveClassifier.set("shadowJar")
Expand Down

0 comments on commit c7de1e8

Please sign in to comment.