Skip to content

Commit

Permalink
Merge pull request #96 from Lemirda/master-andromeda
Browse files Browse the repository at this point in the history
Fix actions for github
  • Loading branch information
13lackHawk authored Mar 27, 2024
2 parents 1963858 + 61beee6 commit 4dec094
Show file tree
Hide file tree
Showing 10 changed files with 46 additions and 7,048 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-map-renderer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

on:
push:
branches: [ master, staging, trying ]
branches: [ master-andromeda, staging, trying ] #A-13 Actions fix
merge_group:
pull_request:
types: [ opened, reopened, synchronize, ready_for_review ]
branches: [ master ]
branches: [ master-andromeda ] #A-13 Actions fix

jobs:
build:
Expand Down
62 changes: 0 additions & 62 deletions .github/workflows/build-test-debug.yml

This file was deleted.

27 changes: 0 additions & 27 deletions .github/workflows/close-master-pr.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/conflict-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Check Merge Conflicts
on:
push:
branches:
- master
- master-andromeda #A-13 Actions fix
pull_request_target:

jobs:
Expand All @@ -14,6 +14,6 @@ jobs:
- name: Check for Merge Conflicts
uses: ike709/actions-label-merge-conflict@9eefdd17e10566023c46d2dc6dc04fcb8ec76142
with:
dirtyLabel: "Merge Conflict"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
dirtyLabel: "bug"
repoToken: "${{ secrets.GITHUB_TOKEN }}" #A-13 Actions fix
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
4 changes: 2 additions & 2 deletions .github/workflows/test-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

on:
push:
branches: [ master, staging, trying ]
branches: [ master-andromeda, staging, trying ] #A-13 Actions fix
paths:
- '**.cs'
- '**.csproj'
Expand All @@ -16,7 +16,7 @@ on:
merge_group:
pull_request:
types: [ opened, reopened, synchronize, ready_for_review ]
branches: [ master ]
branches: [ master-andromeda ] #A-13 Actions fix
paths:
- '**.cs'
- '**.csproj'
Expand Down
52 changes: 0 additions & 52 deletions .github/workflows/update-credits.yml

This file was deleted.

92 changes: 0 additions & 92 deletions .github/workflows/update-wiki.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/validate-rgas.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: RGA schema validator
on:
push:
branches: [ master, staging, trying ]
branches: [ master-andromeda, staging, trying ] #A-13 Actions fix
merge_group:
pull_request:
types: [ opened, reopened, synchronize, ready_for_review ]
Expand Down
38 changes: 38 additions & 0 deletions .github/workflows/validate_mapfiles.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Map file schema validator
on:
push:
branches: [ master-andromeda, staging, trying ] #A-13 Actions fix
merge_group:
pull_request:
types: [ opened, reopened, synchronize, ready_for_review ]

jobs:
yaml-schema-validation:
name: YAML map schema validator
if: github.actor != 'IanComradeBot' && github.event.pull_request.draft == false
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- name: Setup Submodule
run: git submodule update --init
# Corvax-Secrets-Start
- name: Setup secrets
env:
SSH_KEY: ${{ secrets.SECRETS_PRIVATE_KEY }}
if: ${{ env.SSH_KEY != '' }}
run: |
mkdir ~/.ssh
echo "${{ secrets.SECRETS_PRIVATE_KEY }}" > ~/.ssh/id_rsa
chmod 600 ~/.ssh/id_rsa
echo "HOST *" > ~/.ssh/config
echo "StrictHostKeyChecking no" >> ~/.ssh/config
git -c submodule.Secrets.update=checkout submodule update --init
# Corvax-Secrets-End
- name: Pull engine updates
uses: space-wizards/[email protected]
- uses: PaulRitter/yaml-schema-validator@v1
with:
schema: RobustToolbox/Schemas/mapfile.yml
path_pattern: '.*Resources/Maps/.*|.*Resources/Maps/Andromeda/.*' #A-13 Actions fix
validators_path: RobustToolbox/Schemas/mapfile_validators.py
validators_requirements: RobustToolbox/Schemas/mapfile_requirements.txt
Loading

0 comments on commit 4dec094

Please sign in to comment.