forked from Skyrat-SS13/Skyrat-tg
-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Tweak: merge conflict detection branch
Update conflicts.yml (#27) correct dm validation Delete codeowner_reviews.yml Add CI for modular_ss220
- Loading branch information
Showing
5 changed files
with
33 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters