From e7e16008b7390cecadd951cea1b405abb3452c86 Mon Sep 17 00:00:00 2001 From: divious1 Date: Fri, 2 Apr 2021 12:47:00 -0400 Subject: [PATCH 1/2] fixed minor bug with appinspect where it tries to create a report folder that already exists --- bin/appinspect.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/bin/appinspect.sh b/bin/appinspect.sh index 00b0f22ce4..7ac93bb9f7 100755 --- a/bin/appinspect.sh +++ b/bin/appinspect.sh @@ -25,7 +25,15 @@ PACKAGE_PATH="/home/circleci/"$PACKAGE_NAME cd $APP_PATH -mkdir report + +# check if report exists +if [ -d report ] +then + echo "report/ Directory exists" +else + mkdir report +fi + # get a JWT token AUTH_TOKEN=$(echo -n "$USERNAME:$PASSWORD" | base64) APPINSPECT_TOKEN=$(curl -s --location --request GET 'https://api.splunk.com/2.0/rest/login/splunk' --header "Authorization: Basic $AUTH_TOKEN" | jq -r '.data | .token') From dda609273e62e8e7bd3a8e5f8d552bfbdf0124ef Mon Sep 17 00:00:00 2001 From: divious1 Date: Fri, 2 Apr 2021 12:49:31 -0400 Subject: [PATCH 2/2] moved workflow around to have auth jobs be done via a tag release --- .circleci/config.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 023b54b0d9..c081f5c9c4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -464,7 +464,9 @@ workflows: - build-package filters: tags: - only: /.*/ + only: /^v.*/ + branches: + ignore: /.*/ - create-report: requires: - validate-content @@ -474,6 +476,8 @@ workflows: filters: tags: only: /^v.*/ + branches: + ignore: /.*/ - update-sources-github: # update package and docs in github if is a tag requires: