Skip to content

Commit

Permalink
Moved to a PR based system, which notifies on conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim203 committed Jan 29, 2025
1 parent f04278b commit 462739c
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 41 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: master # Target branch
upstream: SpigotMC:master # 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
26 changes: 26 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Sync and publish to opencollab repo

on:
workflow_dispatch:
push:
branches:
- "master"

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: 8
distribution: zulu
server-id: opencollab
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
- name: Publish package
run: mvn --batch-mode deploy
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
MAVEN_USERNAME: ${{ vars.DEPLOY_USER }}
MAVEN_PASSWORD: ${{ secrets.DEPLOY_PASS }}
41 changes: 0 additions & 41 deletions .github/workflows/sync-publish.yml

This file was deleted.

0 comments on commit 462739c

Please sign in to comment.