Skip to content

Commit

Permalink
Tweak: merge conflict detection branch
Browse files Browse the repository at this point in the history
Update conflicts.yml (#27)
correct dm validation
Delete codeowner_reviews.yml
Add CI for modular_ss220
  • Loading branch information
dj-34 authored and Dimach committed Jul 15, 2024
1 parent 70915e3 commit 6e59b4b
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 32 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ jobs:
run: |
bash tools/ci/check_grep.sh
bash modular_nova/tools/nova_check_grep.sh # NOVA EDIT ADDITION - checking modular_nova code
bash ss220/tools/ss220_check_grep.sh # SS220 EDIT ADDITION - checking modular_ss220 code
- name: Ticked File Enforcement
if: steps.linter-setup.conclusion == 'success' && !cancelled()
run: |
Expand Down
32 changes: 0 additions & 32 deletions .github/workflows/codeowner_reviews.yml

This file was deleted.

19 changes: 19 additions & 0 deletions .github/workflows/conflicts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: 'Merge Conflict Detection'
on:
push:
branches:
- master220
- 'project/**'
pull_request_target:
types: [ready_for_review, opened, synchronize, reopened]
jobs:
triage:
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-20.04
steps:
- uses: eps1lon/[email protected]
with:
dirtyLabel: 'Merge Conflict'
repoToken: ${{ secrets.GITHUB_TOKEN }}
12 changes: 12 additions & 0 deletions ss220/tools/ss220_check_grep.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/bash

#ANSI Escape Codes for colors to increase contrast of errors
RED="\033[0;31m"
GREEN="\033[0;32m"
BLUE="\033[0;34m"
NC="\033[0m" # No Color

echo -e "${BLUE}Re-running grep checks, but looking in modular_ss220...${NC}"

# Run the linters again, but modular skyrat code.
sed "s|code/\*\*/\*\.dm|modular_ss220/\*\*/\*\.dm|g" <tools/ci/check_grep.sh | bash
1 change: 1 addition & 0 deletions tools/build/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ export const DmTarget = new Juke.Target({
'icons/**',
'interface/**',
'modular_nova/**', ///NOVA EDIT ADDITION - Making the CBT work
'modular_ss220/**', ///SS220 EDIT ADDITION - Making the CBT work
`${DME_NAME}.dme`,
NamedVersionFile,
],
Expand Down

0 comments on commit 6e59b4b

Please sign in to comment.