mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GitHub test script updates (#9507)

Browse Source 
* GitHub test script updates
add --reject to apply so it will skip binary files since GitHub does not create diffs for them correctly
Add new directories to the removal cleanup. Remove non-existant ones.

* Cleaner way to apply skip png files explicitly.
That way patches are still atomic.
This commit is contained in:
Tony Murray
2018-12-05 10:48:56 -06:00
committed by GitHub
parent 3fc5ae6a24
commit ad41a18f5c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/github-apply
View File

@@ -5,5 +5,5 @@ cd $LIBRENMS_DIR
case $1 in
''|*[!0-9]*) echo "You must specify a PR number to apply a patch" ;;
*) curl -s https://patch-diff.githubusercontent.com/raw/librenms/librenms/pull/${1}.diff | git apply -v ${2} ;;
*) curl -s https://patch-diff.githubusercontent.com/raw/librenms/librenms/pull/${1}.diff | git apply --exclude=*.png -v ${2} ;;
esac

4
scripts/github-remove
View File

@@ -31,8 +31,8 @@ args = parser.parse_args()
if args.discard:
if confirm("Are you sure you want to delete all modified and untracked files?"):
dirs = ["app/", "contrib/", "doc/", "html/", "includes/", "lib/", "LibreNMS/",
"licenses/", "mibs/", "misc/", "scripts/", "sql-schema/", "tests/"]
dirs = ["app/", "bootstrap/", "contrib/", "databases/", "doc/", "html/", "includes/", "LibreNMS/",
"licenses/", "mibs/", "misc/", "resources/", "routes", "scripts/", "sql-schema/", "tests/"]
call(["git", "reset", "-q"], cwd=librenms_dir)
call(["git", "checkout", "."], cwd=librenms_dir)