Skip to content

Commit

Permalink
main: improve messaging
Browse files Browse the repository at this point in the history
  • Loading branch information
Emma Doyle committed Sep 9, 2023
1 parent 410bbe2 commit 5a293fe
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ orbs:
orb-tools: circleci/orb-tools@11.6.1
circleci-cli: circleci/circleci-cli@0.1.9
dynamic: bjd2385/dynamic-continuation@dev:alpha
# dynamic: bjd2385/dynamic-continuation@3.6.9
# dynamic: bjd2385/dynamic-continuation@3.7.0
general: bjd2385/general@0.7.5
slack: circleci/slack@4.12.5

Expand All @@ -19,7 +19,6 @@ workflows:

- dynamic/continue:
context: orb-publishing
force-all: true

# On tag

Expand Down
2 changes: 1 addition & 1 deletion src/scripts/filter.sh
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ fi

# Add each module to `modules-filtered` if 1) `force-all` is set to `true`, or 2) there is a diff against main at HEAD, or 3) no workflow runs have occurred on the default branch for this project in the past $SH_REPORTING_WINDOW days.
if [ "$SH_FORCE_ALL" -eq 1 ] || { [ "$SH_REPORTING_WINDOW" != "" ] && [ "$(curl -s -X GET --url "https://circleci.com/api/v2/insights/${SH_PROJECT_TYPE}/${_CIRCLE_ORGANIZATION}/${CIRCLE_PROJECT_REPONAME}/workflows?reporting-window=${SH_REPORTING_WINDOW}" --header "Circle-Token: ${_CIRCLE_TOKEN}" | jq -r "[ .items[].name ] | length")" -eq "0" ]; }; then
info "running all workflows."
info "force-all set: running all workflows."
printf "%s" "$SH_MODULES" | awk NF | while read -r module; do
module_dots="$(sed 's@\/@\.@g' <<< "$module")"
if [ "${#module_dots}" -gt 1 ] && [ "${module_dots::1}" = "." ]; then
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/reduce.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# shellcheck disable=SC2288,SC2001,SC2148,SC2002,SC2016,SC2046

printf "Here\\n"

# If `modules` is unavailable, stop this job without continuation
if [ ! -f "$SH_MODULES_FILTERED" ] || [ ! -s "$SH_MODULES_FILTERED" ]; then
Expand All @@ -9,6 +8,7 @@ if [ ! -f "$SH_MODULES_FILTERED" ] || [ ! -s "$SH_MODULES_FILTERED" ]; then
exit 0
fi


# Convert a list of dirs to a list of config files under .circleci/.
awk "{
if (\$0 ~ /^\\.\$/) {
Expand Down

0 comments on commit 5a293fe

Please sign in to comment.