diff --git a/.github/workflows/auto-approve-dominions-prs.yml b/.github/workflows/auto-approve-dominions-prs.yml index 53546b6f66..cd499fffde 100644 --- a/.github/workflows/auto-approve-dominions-prs.yml +++ b/.github/workflows/auto-approve-dominions-prs.yml @@ -8,7 +8,6 @@ on: branches: - dev - master - - V6 concurrency: group: "approve-dominion-${{ github.head_ref || github.run_id }}-${{ github.event_name }}" diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml index 483a030d50..bad76f3ba3 100644 --- a/.github/workflows/ci-pipeline.yml +++ b/.github/workflows/ci-pipeline.yml @@ -25,18 +25,15 @@ on: branches: - dev - master - - V6 pull_request: branches: - dev - master - - V6 pull_request_target: types: [ opened, reopened, labeled, synchronize ] branches: - dev - master - - V6 env: TGS_DOTNET_VERSION: 8 diff --git a/.github/workflows/code-scanning.yml b/.github/workflows/code-scanning.yml index a7baad0e0e..b661059144 100644 --- a/.github/workflows/code-scanning.yml +++ b/.github/workflows/code-scanning.yml @@ -5,12 +5,10 @@ on: branches: - dev - master - - V6 pull_request: branches: - dev - master - - V6 env: TGS_DOTNET_VERSION: 8 diff --git a/.github/workflows/v6-integration.yml b/.github/workflows/v6-integration.yml deleted file mode 100644 index 83be1561eb..0000000000 --- a/.github/workflows/v6-integration.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: 'V6 Integration' - -on: - push: - branches: - - dev - -jobs: - v6-integration: - - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v1 - - - name: Merge dev into V6 - uses: robotology/gh-action-nightly-merge@22f5e45d028f22837d617fa07512925457eec184 #v1.3.3 - with: - stable_branch: 'dev' - development_branch: 'V6' - allow_ff: true - allow_forks: true - user_name: tgstation-server - user_email: tgstation-server@users.noreply.github.com - push_token: DEV_PUSH_TOKEN - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - DEV_PUSH_TOKEN: ${{ secrets.DEV_PUSH_TOKEN }}