Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into dev/3.0.0
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/gradle.yml
  • Loading branch information
Tim203 committed Jan 29, 2025
2 parents 876b9c3 + 30fa13a commit 7761f77
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 25 deletions.
9 changes: 9 additions & 0 deletions .github/pull.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version: "1"
rules:
- base: main # Target branch
upstream: PaperMC:dev/3.0.0 # Must be in the same fork network.
mergeMethod: hardreset # Optional, one of [none, merge, squash, rebase, hardreset], Default: none.
mergeUnstable: false # merge pull request even when the mergeable_state is not clean. Default: false
conflictReviewers: # Optional, on merge conflict assign a reviewer
- Tim203
conflictLabel: "merge-conflict" # Optional, on merge conflict assign a custom label, Default: merge-conflict
23 changes: 0 additions & 23 deletions .github/workflows/gradle.yml

This file was deleted.

29 changes: 29 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Publish to opencollab repo

on:
workflow_dispatch:
push:
branches:
- "main"

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin
server-id: opencollab
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
with:
validate-wrappers: true
- name: Publish to Maven Repository
run: gradle publish
env:
ORG_GRADLE_PROJECT_geysermcUsername: ${{ vars.DEPLOY_USER }}
ORG_GRADLE_PROJECT_geysermcPassword: ${{ secrets.DEPLOY_PASS }}
4 changes: 2 additions & 2 deletions build-logic/src/main/kotlin/velocity-publish.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ extensions.configure<PublishingExtension> {
maven {
credentials(PasswordCredentials::class.java)

name = "paper"
val base = "https://repo.papermc.io/repository/maven"
name = "geysermc"
val base = "https://repo.opencollab.dev/maven"
val releasesRepoUrl = "$base-releases/"
val snapshotsRepoUrl = "$base-snapshots/"
setUrl(if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl)
Expand Down
1 change: 1 addition & 0 deletions proxy/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ plugins {
application
id("velocity-init-manifest")
alias(libs.plugins.shadow)
id("velocity-publish")
}

application {
Expand Down

0 comments on commit 7761f77

Please sign in to comment.