Skip to content

Commit 4566781

Browse files
committed
Env update for Qt.
1 parent d106828 commit 4566781

File tree

3 files changed

+1
-5
lines changed

3 files changed

+1
-5
lines changed

docker/manylinux2014/Dockerfile_aarch64

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,5 +141,3 @@ RUN git config --global --add safe.directory /io
141141
ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/ffmpeg_build/lib/pkgconfig
142142
ENV LDFLAGS -L/ffmpeg_build/lib
143143
ENV PATH "$HOME/bin:$PATH"
144-
# forces NodeJS 16 for Github actions, see https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/
145-
ENV ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true

docker/manylinux2014/Dockerfile_x86_64

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,5 +140,3 @@ RUN git config --global --add safe.directory /io
140140
ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/ffmpeg_build/lib/pkgconfig
141141
ENV LDFLAGS -L/ffmpeg_build/lib
142142
ENV PATH "$HOME/bin:$PATH"
143-
# forces NodeJS 16 for Github actions, see https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/
144-
ENV ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true

travis_config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ if [ -n "$IS_OSX" ]; then
3434
export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"
3535
else
3636
echo " > Linux environment "
37-
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/Qt5.15.13/lib
37+
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/Qt5.15.16/lib
3838
export MAKEFLAGS="-j$(grep -E '^processor[[:space:]]*:' /proc/cpuinfo | wc -l)"
3939
CURRENT_ARCH=$(uname -m)
4040
if [[ $CURRENT_ARCH == 'aarch64' ]]; then

0 commit comments

Comments
 (0)