diff --git a/.github/workflows/build-map-renderer.yml b/.github/workflows/build-map-renderer.yml index 35aed1a7f7..250716e412 100644 --- a/.github/workflows/build-map-renderer.yml +++ b/.github/workflows/build-map-renderer.yml @@ -2,11 +2,11 @@ on: push: - branches: [ master, staging, trying ] + branches: [ take2, staging, trying ] merge_group: pull_request: types: [ opened, reopened, synchronize, ready_for_review ] - branches: [ master ] + branches: [ take2 ] jobs: build: diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml index 47f9fd1a51..43dc86c7bc 100644 --- a/.github/workflows/build-test-debug.yml +++ b/.github/workflows/build-test-debug.yml @@ -2,11 +2,11 @@ name: Build & Test Debug on: push: - branches: [ master, staging, trying ] + branches: [ take2, staging, trying ] merge_group: pull_request: types: [ opened, reopened, synchronize, ready_for_review ] - branches: [ master ] + branches: [ take2 ] jobs: build: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml.disabled similarity index 100% rename from .github/workflows/publish.yml rename to .github/workflows/publish.yml.disabled diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml index 2dce502697..a79ef0cf31 100644 --- a/.github/workflows/test-packaging.yml +++ b/.github/workflows/test-packaging.yml @@ -2,7 +2,7 @@ on: push: - branches: [ master, staging, trying ] + branches: [ take2, staging, trying ] paths: - '**.cs' - '**.csproj' @@ -16,7 +16,7 @@ on: merge_group: pull_request: types: [ opened, reopened, synchronize, ready_for_review ] - branches: [ master ] + branches: [ take2 ] paths: - '**.cs' - '**.csproj' diff --git a/.github/workflows/update-credits.yml b/.github/workflows/update-credits.yml index e35d4def7d..3f4d63950b 100644 --- a/.github/workflows/update-credits.yml +++ b/.github/workflows/update-credits.yml @@ -4,44 +4,44 @@ on: workflow_dispatch: schedule: - cron: 0 0 * * 0 - + jobs: get_credits: runs-on: ubuntu-latest # Hey there fork dev! If you like to include your own contributors in this then you can probably just change this to your own repo # Do this in dump_github_contributors.ps1 too into your own repo - if: github.repository == 'space-wizards/space-station-14' - + if: github.repository == 'Citadel-Station-13/space-station-14' + steps: - uses: actions/checkout@v3.6.0 with: ref: master - + - name: Get this week's Contributors shell: pwsh run: Tools/dump_github_contributors.ps1 > Resources/Credits/GitHub.txt # TODO #- name: Get this week's Patreons - # run: Tools/script2dumppatreons > Resources/Credits/Patrons.yml - + # run: Tools/script2dumppatreons > Resources/Credits/Patrons.yml + # MAKE SURE YOU ENABLED "Allow GitHub Actions to create and approve pull requests" IN YOUR ACTIONS, OTHERWISE IT WILL MOST LIKELY FAIL - # For this you can use a pat token of an account with direct push access to the repo if you have protected branches. + # For this you can use a pat token of an account with direct push access to the repo if you have protected branches. # Uncomment this and comment the other line if you do this. # https://github.com/stefanzweifel/git-auto-commit-action#push-to-protected-branches - + #- name: Commit new credit files # uses: stefanzweifel/git-auto-commit-action@v4 # with: # commit_message: Update Credits # commit_author: PJBot - + # This will make a PR - name: Set current date as env variable run: echo "NOW=$(date +'%Y-%m-%dT%H-%M-%S')" >> $GITHUB_ENV - + - name: Create Pull Request uses: peter-evans/create-pull-request@v5 with: diff --git a/.github/workflows/validate-rgas.yml b/.github/workflows/validate-rgas.yml index 2c4bb40fdf..cf7f3078ef 100644 --- a/.github/workflows/validate-rgas.yml +++ b/.github/workflows/validate-rgas.yml @@ -1,7 +1,7 @@ name: RGA schema validator on: push: - branches: [ master, staging, trying ] + branches: [ take2, staging, trying ] merge_group: pull_request: types: [ opened, reopened, synchronize, ready_for_review ] diff --git a/.github/workflows/validate_mapfiles.yml b/.github/workflows/validate_mapfiles.yml index fb11e1a469..d91bd53455 100644 --- a/.github/workflows/validate_mapfiles.yml +++ b/.github/workflows/validate_mapfiles.yml @@ -1,7 +1,7 @@ name: Map file schema validator on: push: - branches: [ master, staging, trying ] + branches: [ take2, staging, trying ] merge_group: pull_request: types: [ opened, reopened, synchronize, ready_for_review ] diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml index 691eb29f1d..b0fc120c38 100644 --- a/.github/workflows/yaml-linter.yml +++ b/.github/workflows/yaml-linter.yml @@ -2,7 +2,7 @@ name: YAML Linter on: push: - branches: [ master, staging, trying ] + branches: [ take2, staging, trying ] merge_group: pull_request: types: [ opened, reopened, synchronize, ready_for_review ] diff --git a/Tools/dump_github_contributors.ps1 b/Tools/dump_github_contributors.ps1 index 10e74bcf0b..7dbf14e7be 100755 --- a/Tools/dump_github_contributors.ps1 +++ b/Tools/dump_github_contributors.ps1 @@ -27,7 +27,7 @@ function load_contribs([string] $repo) } $engineJson = load_contribs("space-wizards/RobustToolbox") -$contentJson = load_contribs("space-wizards/space-station-14") +$contentJson = load_contribs("Citadel-Station-13/space-station-14") ($engineJson).login + ($contentJson).login + ($add) ` | select -unique `