Skip to content

Commit

Permalink
Install all components by default
Browse files Browse the repository at this point in the history
Signed-off-by: Jonathan Schwender <[email protected]>
  • Loading branch information
jschwe committed Oct 6, 2024
1 parent b5cc055 commit ccf9058
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 3 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ jobs:
SDK_PATH: "${{ steps.sdk-with-components.outputs.sdk-path }}"
run: |
${OHOS_SDK_NATIVE}/llvm/bin/clang --version
${SDK_PATH}/*/toolchains/hdc --version
if [[ test -d "${SDK_PATH}"/*/previewer ]]; then
echo "Unselected component should not be present"
exit 1
fi
- name: Remove previous SDK installation
env:
SDK_PATH: "${{ steps.sdk-with-components.outputs.sdk-path }}"
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# v0.2 (unreleased)

- Now supports OH 5.0
- The `components` input now defaults to `all`, since `hvigor` 5 will throw an error if not all
components are installed.
2 changes: 1 addition & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ inputs:
components:
description: "Semicolon separated list of SDK components that should be made available"
required: false
default: 'native'
default: 'all'
fixup-path:
description: "Whether to fixup the output paths so that the components appear under api level directory"
required: false
Expand Down
7 changes: 6 additions & 1 deletion install_ohos_sdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,12 @@ fi

OHOS_BASE_SDK_HOME="$PWD"

IFS=";" read -ra COMPONENTS <<< "${INPUT_COMPONENTS}"
if [[ "${INPUT_COMPONENTS}" == "all" ]]; then
COMPONENTS=(*.zip)
else
IFS=";" read -ra COMPONENTS <<< "${INPUT_COMPONENTS}"
fi

for COMPONENT in "${COMPONENTS[@]}"
do
echo "Extracting component ${COMPONENT}"
Expand Down

0 comments on commit ccf9058

Please sign in to comment.