ARCHIVE/xrpl-dev-portal
1
0
Fork 0
mirror of https://github.com/XRPLF/xrpl-dev-portal.git synced 2025-11-20 03:35:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix all-target-link-checker var clash

Browse Source
This commit is contained in:
mDuo13
2018-03-07 16:07:06 -08:00
parent d351f409c6
commit c466e85614
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tool/all-target-link-checker.sh
View File

@@ -2,9 +2,10 @@
mkdir -p out mkdir -p out
# Pass forward dactyl "vars" arg if provided # Pass forward dactyl "vars" arg if provided
if [ -n "$1" ]; if [ "$1" == "--vars" ] && [ -n "$2" ];
then then
dactyl_vars=$1 dactyl_vars=$2
shift 2
fi fi
targets=`dactyl_build -lq | awk '{print $1}'` targets=`dactyl_build -lq | awk '{print $1}'`

5
tool/jenkins.sh
View File

@@ -11,7 +11,8 @@ gitForkWithoutSuffix=${ghprbAuthorRepoGitUrl%.git}
if [ -n "$ghprbPullId" ]; if [ -n "$ghprbPullId" ];
then then
dactyl_vars="'"'{"github_forkurl": "'"$gitForkWithoutSuffix"'", "github_branch": "'"$ghprbSourceBranch"'", "github_pr_id": "'"$ghprbPullId"'", "is_pr_build": true}'"'" echo '{"github_forkurl": "'"$gitForkWithoutSuffix"'", "github_branch": "'"$ghprbSourceBranch"'", "github_pr_id": "'"$ghprbPullId"'", "is_pr_build": true}' > pr_vars.json
dactyl_vars="pr_vars.json"
else else
dactyl_vars="" dactyl_vars=""
fi fi
@@ -19,4 +20,4 @@ fi
set -e set -e
tool/conflictmarkers.sh tool/conflictmarkers.sh
tool/all-target-link-checker.sh "$dactyl_vars" tool/all-target-link-checker.sh --vars "$dactyl_vars"