From e716a149633b68dc336e9c268d8638e170db1f48 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT Date: Fri, 3 Nov 2023 19:24:40 -0700 Subject: [PATCH] update branch names in GitHub workflows --- .github/workflows/build-map-renderer.yml | 4 ++-- .github/workflows/build-test-debug.yml | 4 ++-- .github/workflows/conflict-labeler.yml | 2 +- .github/workflows/test-packaging.yml | 4 ++-- .github/workflows/update-credits.yml | 2 +- .github/workflows/validate-rgas.yml | 2 +- .github/workflows/validate_mapfiles.yml | 2 +- .github/workflows/yaml-linter.yml | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-map-renderer.yml b/.github/workflows/build-map-renderer.yml index e921bd2558..619883ef9e 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: [ main, staging, trying ] # Parkstation-GitMain merge_group: pull_request: types: [ opened, reopened, synchronize, ready_for_review ] - branches: [ master ] + branches: [ main ] # Parkstation-GitMain jobs: build: diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml index 9abd4fbe17..f0a8a4a441 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: [ main, staging, trying ] # Parkstation-GitMain merge_group: pull_request: types: [ opened, reopened, synchronize, ready_for_review ] - branches: [ master ] + branches: [ main ] # Parkstation-GitMain jobs: build: diff --git a/.github/workflows/conflict-labeler.yml b/.github/workflows/conflict-labeler.yml index a78716bde6..2796915210 100644 --- a/.github/workflows/conflict-labeler.yml +++ b/.github/workflows/conflict-labeler.yml @@ -3,7 +3,7 @@ name: Check Merge Conflicts on: push: branches: - - master + - main # Parkstation-GitMain pull_request_target: jobs: diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml index 815b6a4adc..36a099ca3b 100644 --- a/.github/workflows/test-packaging.yml +++ b/.github/workflows/test-packaging.yml @@ -2,7 +2,7 @@ on: push: - branches: [ master, staging, trying ] + branches: [ main, staging, trying ] # Parkstation-GitMain paths: - '**.cs' - '**.csproj' @@ -16,7 +16,7 @@ on: merge_group: pull_request: types: [ opened, reopened, synchronize, ready_for_review ] - branches: [ master ] + branches: [ main ] # Parkstation-GitMain paths: - '**.cs' - '**.csproj' diff --git a/.github/workflows/update-credits.yml b/.github/workflows/update-credits.yml index e0333096c4..25c8670e34 100644 --- a/.github/workflows/update-credits.yml +++ b/.github/workflows/update-credits.yml @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/checkout@v3.6.0 with: - ref: master + ref: main # Parkstation-GitMain - name: Get this week's Contributors shell: pwsh diff --git a/.github/workflows/validate-rgas.yml b/.github/workflows/validate-rgas.yml index 2c4bb40fdf..8c146306e4 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: [ main, staging, trying ] # Parkstation-GitMain 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..b232cf795e 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: [ main, staging, trying ] # Parkstation-GitMain 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 254384acff..e16ca0a396 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: [ main, staging, trying ] # Parkstation-GitMain merge_group: pull_request: types: [ opened, reopened, synchronize, ready_for_review ]