Skip to content

Commit e9c58a1

Browse files
committed
build.yml: quote environment variables
1 parent 4ebb71f commit e9c58a1

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

.github/workflows/build.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ jobs:
4848
4949
- name: Create build directories
5050
run: |
51-
mkdir -p ./${{ env.BUILD_DIR_NATIVE }}
52-
mkdir -p ./${{ env.BUILD_DIR_CROSS }}
51+
mkdir -p -- "./${{ env.BUILD_DIR_NATIVE }}"
52+
mkdir -p -- "./${{ env.BUILD_DIR_CROSS }}"
5353
5454
- name: Cache toolchain dir
5555
id: cache-toolchain
@@ -62,12 +62,12 @@ jobs:
6262
if: steps.cache-toolchain.outputs.cache-hit != 'true'
6363
working-directory: /opt
6464
run: |
65-
wget -q -O toolchain.tar.gz ${TOOLCHAIN_URL}
65+
wget -q -O toolchain.tar.gz -- "${TOOLCHAIN_URL}"
6666
tar xf toolchain.tar.gz
67-
pushd ${TOOLCHAIN_DIR}
67+
pushd -- "${TOOLCHAIN_DIR}"
6868
./relocate-sdk.sh
6969
popd
70-
find ${TOOLCHAIN_DIR}/bin -type f -iname "perl*" -delete
70+
find -- "${TOOLCHAIN_DIR}/bin" -type f -iname 'perl*' -delete
7171
7272
- name: Install native dependencies
7373
env:
@@ -80,7 +80,7 @@ jobs:
8080
env:
8181
CCACHE_DIR: ${{ github.workspace }}/${{ env.CCACHE_DIR_NATIVE }}
8282
run: |
83-
pushd ./${{ env.BUILD_DIR_NATIVE }}
83+
pushd -- "./${{ env.BUILD_DIR_NATIVE }}"
8484
cmake .. \
8585
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
8686
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
@@ -114,11 +114,11 @@ jobs:
114114
env:
115115
CCACHE_DIR: ${{ github.workspace }}/${{ env.CCACHE_DIR_CROSS }}
116116
run: |
117-
pushd ./${{ env.BUILD_DIR_CROSS }}
117+
pushd -- "./${{ env.BUILD_DIR_CROSS }}"
118118
cmake .. \
119119
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
120120
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
121-
-DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} \
121+
-DCMAKE_TOOLCHAIN_FILE="${TOOLCHAIN_FILE}" \
122122
-DCMAKE_BUILD_TYPE=Release \
123123
-DPLATFORM=rpi \
124124
-DHYPERION_LIGHT=ON \
@@ -137,28 +137,28 @@ jobs:
137137
-DENABLE_PROTOBUF_SERVER=OFF \
138138
-DENABLE_FORWARDER=ON \
139139
-DENABLE_FLATBUF_CONNECT=ON \
140-
-DIMPORT_FLATC=${GITHUB_WORKSPACE}/hyperion.ng/${BUILD_DIR_NATIVE}/flatc_export.cmake
140+
-DIMPORT_FLATC="${GITHUB_WORKSPACE}/hyperion.ng/${BUILD_DIR_NATIVE}/flatc_export.cmake"
141141
make
142142
popd
143143
144144
- name: Copy built binaries to release/
145145
run: |
146-
mkdir ./release
147-
cp -r ./${{ env.BUILD_DIR_CROSS }}/bin/* ./release/
146+
rm -rf ./release
147+
cp -r -T -- "./${{ env.BUILD_DIR_CROSS }}/bin" ./release
148148
find ./release
149149
150150
- name: Copy dependencies to release/
151151
env:
152152
dependency_libs: libpython3.10.so.1.0 libpng16.so.16 libjpeg.so.8 libcrypto.so.1.1 libz.so.1 libssl.so.1.1 libpcre2-16.so.0 libQt5Gui.so.5 libQt5Network.so.5 libQt5Widgets.so.5 libk5crypto.so.3 libatomic.so.1 libQt5Core.so.5 libkrb5support.so.0 libcom_err.so.3 libstdc++.so.6 libkrb5.so.3 libQt5Sql.so.5 libgssapi_krb5.so.2 libQt5SerialPort.so.5 libusb-1.0.so.0 libudev.so.1
153153
run: |
154-
for i in ${{ env.dependency_libs }}; do find ${TOOLCHAIN_DIR}/arm-webos-linux-gnueabi/sysroot/ -name $i -exec cp {} ./release/ \;; done
154+
for i in ${{ env.dependency_libs }}; do find -- "${TOOLCHAIN_DIR}/arm-webos-linux-gnueabi/sysroot/" -name "${i}" -exec cp -t ./release -- {} \;; done
155155
mkdir -p ./release/sqldrivers
156156
mkdir -p ./release/imageformats
157157
mkdir -p ./release/python/lib
158-
cp ${TOOLCHAIN_DIR}/arm-webos-linux-gnueabi/sysroot/usr/lib/qt/plugins/sqldrivers/libqsqlite.so ./release/sqldrivers/
159-
cp ${TOOLCHAIN_DIR}/arm-webos-linux-gnueabi/sysroot/usr/lib/qt/plugins/imageformats/libqico.so ./release/imageformats/
160-
cp ${TOOLCHAIN_DIR}/arm-webos-linux-gnueabi/sysroot/usr/lib/qt/plugins/imageformats/libqjpeg.so ./release/imageformats/
161-
cp -r ${TOOLCHAIN_DIR}/arm-webos-linux-gnueabi/sysroot/usr/lib/python3.10 ./release/python/lib/
158+
cp -t ./release/sqldrivers -- "${TOOLCHAIN_DIR}/arm-webos-linux-gnueabi/sysroot/usr/lib/qt/plugins/sqldrivers/libqsqlite.so"
159+
cp -t ./release/imageformats -- "${TOOLCHAIN_DIR}/arm-webos-linux-gnueabi/sysroot/usr/lib/qt/plugins/imageformats/libqico.so"
160+
cp -t ./release/imageformats -- "${TOOLCHAIN_DIR}/arm-webos-linux-gnueabi/sysroot/usr/lib/qt/plugins/imageformats/libqjpeg.so"
161+
cp -r -t ./release/python/lib -- "${TOOLCHAIN_DIR}/arm-webos-linux-gnueabi/sysroot/usr/lib/python3.10"
162162
find ./release
163163
164164
- name: Upload artifacts
@@ -215,16 +215,16 @@ jobs:
215215
- run: npm run build -- --env production
216216
- name: Build service
217217
run: |
218-
mkdir -p ./dist/service
219-
rm -rf ./dist/service/*
220218
mkdir -p ./service/build
221-
pushd service/build
219+
pushd ./service/build
222220
cmake .. \
223221
-DCMAKE_BUILD_TYPE=Release \
224-
-DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE}
222+
-DCMAKE_TOOLCHAIN_FILE="${TOOLCHAIN_FILE}"
225223
make
226224
popd
227-
cp -r ./service/build/dist/* ./dist/service/
225+
mkdir -p ./dist
226+
rm -rf ./dist/service
227+
cp -r -T -- ./service/build/dist ./dist/service
228228
229229
- name: Copy hyperion.ng into dist/service/hyperion
230230
run: |

0 commit comments

Comments
 (0)