erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-24 00:27:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

chore(web): Revert changes spun off into #8831

Browse source 
This reverts commit a4881bc417.
This commit is contained in:
Joshua A. Horton 2023-05-30 09:04:11 +07:00
parent 194d46693f
commit bd22eb7b4e
2 changed files with 4 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
resources/build/test/test.sh
View file

@ -18,7 +18,7 @@ cd "$THIS_SCRIPT_PATH"
builder_describe - clean build
builder_parse "build"
if [[ "${_builder_chosen_action_targets[@]}" != "build:project" ]]; then
builder_die " Test: builder_parse, shorthand form 'build' should give us 'build:project'"
builder_die " Test: builder_parse, shorthand form 'build' should give us 'build:project"
fi
if builder_start_action build; then
@ -44,7 +44,7 @@ builder_describe_parse_short_test() {
fi
}
builder_describe_parse_short_test "clean build test" ":module :tools :app" "build:module build:tools build:app build:project" "build"
builder_describe_parse_short_test "clean build test" ":module :tools :app" "build:module build:tools build:app" "build"
builder_describe_parse_short_test "clean build test" ":module :tools :app" "build:app" "build:app"
builder_describe_parse_short_test "clean build test" ":module :tools :app" "build:app clean:module" "build:app clean:module"
builder_describe_parse_short_test "clean build test" ":module :tools :app :project" "clean:module clean:tools clean:app clean:project build:app build:project" "clean build:app build:project"
@ -113,23 +113,6 @@ builder_describe \
"--zoom,-z Use zoom mode" \
"--feature=FOO Enable feature foo"
#----------------------------------------------------------------------
# Test implicit :project targets
builder_parse_test "clean:app test:engine" "" clean:app test:engine
if builder_has_action test:project; then
builder_die "FAIL: test:project should not have matched project-wide test action"
fi
builder_parse_test "clean:app test:app test:engine test:project" "" clean:app test
if builder_has_action test:project; then
echo "PASS: test:project matched"
else
builder_die: "FAIL: test:project missing for untargeted test action"
fi
#----------------------------------------------------------------------
# Test --options

7
resources/builder.inc.sh
View file

@ -1302,11 +1302,8 @@ _builder_parse_expanded_parameters() {
for e in "${_builder_targets[@]}"; do
_builder_chosen_action_targets+=("$action$e")
done
if ! _builder_item_in_array ":project" "${_builder_targets[@]}"; then
# Also include an action-target pair indicating that the non-targeted action was specified.
_builder_chosen_action_targets+=("$action:project")
fi
# Also include an action-target pair indicating that the non-targeted action was specified.
_builder_chosen_action_targets+=("$action:project")
elif (( has_target )); then
# apply the default action to the selected target