Skip to content
Snippets Groups Projects
Commit e34ea792 authored by Esben Haabendal's avatar Esben Haabendal
Browse files

CI: Fix path to toolchain/bundle/tools packages


Now that we are building artifacts for multiple machines (qemuarma7 and rpi4 for
now), we obviuosly cannot cheat and just do this type of wildcard matching to
get the desired .sh image.

Instead, let's cheat a bit differently, and hardcode the TUNE_PKGARCH value for
qemuarma7 for now. Later on, when we add testing for rpi4 we have to revisit
this.

Signed-off-by: default avatarEsben Haabendal <esben@geanix.com>
parent 9c2c6435
No related branches found
No related tags found
1 merge request!105Adding Pi4 support for basic CI build
...@@ -391,7 +391,7 @@ acts: ...@@ -391,7 +391,7 @@ acts:
- sudo ip link set tap0 up - sudo ip link set tap0 up
- bitbake qemu-helper-native - bitbake qemu-helper-native
- runqemu publicvnc serialstdio & sleep 130 - runqemu publicvnc serialstdio & sleep 130
- ./tmp-*/deploy/sdk/openharmony-tools-*.sh -y -d openharmony-tools - ./tmp-*/deploy/sdk/openharmony-tools-${OPENHARMONY_VERSION}-cortexa7-neon-vfpv4-*.sh -y -d openharmony-tools
- source ./openharmony-tools/environment-setup-$(uname -m)* - source ./openharmony-tools/environment-setup-$(uname -m)*
- i=0 ; while [ "$i" -lt $HDC_CONNECT_ATTEMPTS ] ; do - i=0 ; while [ "$i" -lt $HDC_CONNECT_ATTEMPTS ] ; do
hdc_result="$(hdc tconn 192.168.7.2:35000)" ; echo "hdc:" "$hdc_result" ; hdc_result="$(hdc tconn 192.168.7.2:35000)" ; echo "hdc:" "$hdc_result" ;
...@@ -524,7 +524,7 @@ ohos: ...@@ -524,7 +524,7 @@ ohos:
script: script:
- tar xfz $TARBALL_FILE - tar xfz $TARBALL_FILE
- cd $(basename $TARBALL_FILE .tar.gz)/OpenHarmony - cd $(basename $TARBALL_FILE .tar.gz)/OpenHarmony
- ../../build/tmp-*/deploy/sdk/${PREBUILT_IMAGE}-${OPENHARMONY_VERSION}-*.sh -y -d oniro - ../../build/tmp-*/deploy/sdk/${PREBUILT_IMAGE}-${OPENHARMONY_VERSION}-cortexa7-neon-vfpv4-*.sh -y -d oniro
- ./oniro/setup.sh - ./oniro/setup.sh
- MAX_JOBS="${CI_ONIRO_PARALLEL_BUILD_MAX_JOBS:-$(nproc)}" - MAX_JOBS="${CI_ONIRO_PARALLEL_BUILD_MAX_JOBS:-$(nproc)}"
- NINJA_ARGS="--ninja-args -j$MAX_JOBS" - NINJA_ARGS="--ninja-args -j$MAX_JOBS"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment