From bd30c04974a9d68aa7e777fbded1d784aa2ae4ec Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Wed, 7 Oct 2020 12:03:29 +0200 Subject: [PATCH] GitHub CI: replaced obsolete set-env and add-path --- .github/scripts/Linux/prepare.sh | 12 ++++++------ .github/scripts/Windows/find_msvc.ps1 | 6 +++--- .github/scripts/Windows/prepare.ps1 | 4 ++-- .github/scripts/environment.sh | 4 ++-- .github/scripts/macOS/prepare.sh | 20 ++++++++++---------- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/scripts/Linux/prepare.sh b/.github/scripts/Linux/prepare.sh index 535045afd..e92dd5cdb 100755 --- a/.github/scripts/Linux/prepare.sh +++ b/.github/scripts/Linux/prepare.sh @@ -1,17 +1,17 @@ #!/bin/bash -eux -echo "::set-env name=AJA_DIRECTORY::/var/tmp/ntv2sdk" -echo "::set-env name=CPATH::/usr/local/qt/include" -echo "::set-env name=LIBRARY_PATH::/usr/local/qt/lib" -echo "::set-env name=PKG_CONFIG_PATH::/usr/local/qt/lib/pkgconfig" -echo "::add-path::/usr/local/qt/bin" +echo "AJA_DIRECTORY=/var/tmp/ntv2sdk" >> $GITHUB_ENV +echo "CPATH=/usr/local/qt/include" >> $GITHUB_ENV +echo "LIBRARY_PATH=/usr/local/qt/lib" >> $GITHUB_ENV +echo "PKG_CONFIG_PATH=/usr/local/qt/lib/pkgconfig" >> $GITHUB_ENV +echo "/usr/local/qt/bin" >> $GITHUB_PATH if command -v gcc-5; then CUDA_HOST_COMPILER=gcc-5 else CUDA_HOST_COMPILER=gcc-6 fi -echo "::set-env name=CUDA_HOST_COMPILER::$CUDA_HOST_COMPILER" +echo "CUDA_HOST_COMPILER=$CUDA_HOST_COMPILER" >> $GITHUB_ENV sudo sed -n 'p; /^deb /s/^deb /deb-src /p' -i /etc/apt/sources.list # for build-dep ffmpeg sudo apt update diff --git a/.github/scripts/Windows/find_msvc.ps1 b/.github/scripts/Windows/find_msvc.ps1 index 44e727243..f34d56874 100644 --- a/.github/scripts/Windows/find_msvc.ps1 +++ b/.github/scripts/Windows/find_msvc.ps1 @@ -16,7 +16,7 @@ if (-Not $version) { throw "Cannot get MSVS version" } $version = $version.Trim() -echo "::add-path::$installDir\VC\Tools\MSVC\$version\bin\HostX64\x64" # cl -echo "::add-path::$installDir\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin" -echo "::add-path::$installDir\MSBuild\Current\Bin" +echo "$installDir\VC\Tools\MSVC\$version\bin\HostX64\x64" >> ${env:GITHUB_PATH} # cl +echo "$installDir\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin" >> ${env:GITHUB_PATH} +echo "$installDir\MSBuild\Current\Bin" >> ${env:GITHUB_PATH} diff --git a/.github/scripts/Windows/prepare.ps1 b/.github/scripts/Windows/prepare.ps1 index 7c3a723b0..8f953c022 100644 --- a/.github/scripts/Windows/prepare.ps1 +++ b/.github/scripts/Windows/prepare.ps1 @@ -9,7 +9,7 @@ if (!${env:no_cuda}) { Invoke-WebRequest https://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_441.22_win10.exe -OutFile cuda_inst.exe Start-Process -FilePath "cuda_inst.exe" -ArgumentList "-s nvcc_10.2" -Wait -NoNewWindow Remove-Item cuda_inst.exe - echo "::add-path::C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v10.2\bin" + echo "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v10.2\bin" >> $GITHUB_PATH } # Install XIMEA @@ -28,7 +28,7 @@ if (${env:SDK_URL} -and ${env:GITHUB_REF} -eq "refs/heads/ndi-build") { Start-Process -FilePath "C:\ndi.exe" -ArgumentList "/VERYSILENT" Sleep 10 $sdk=(dir "C:\Program Files\NewTek" -Filter *SDK -Name) - echo "::add-path::C:\Program Files\NewTek\$sdk\Bin\x64" + echo "C:\Program Files\NewTek\$sdk\Bin\x64" >> $GITHUB_PATH #Remove-Item C:\ndi.exe } diff --git a/.github/scripts/environment.sh b/.github/scripts/environment.sh index 774d3edff..717fee60a 100755 --- a/.github/scripts/environment.sh +++ b/.github/scripts/environment.sh @@ -13,5 +13,5 @@ fi export VERSION TAG -echo "::set-env name=VERSION::$VERSION" -echo "::set-env name=TAG::$TAG" +echo "VERSION=$VERSION" >> $GITHUB_ENV +echo "TAG=$TAG" >> $GITHUB_ENV diff --git a/.github/scripts/macOS/prepare.sh b/.github/scripts/macOS/prepare.sh index 028bb8fea..e91876d73 100755 --- a/.github/scripts/macOS/prepare.sh +++ b/.github/scripts/macOS/prepare.sh @@ -5,13 +5,13 @@ TEMP_INST=/tmp/install CPATH=/usr/local/include:/usr/local/opt/qt/include LIBRARY_PATH=/usr/local/lib:/usr/local/opt/qt/lib -echo "::set-env name=AJA_DIRECTORY::$AJA_INST" -echo "::set-env name=UG_SKIP_NET_TESTS::1" -echo "::set-env name=CPATH::$CPATH" -echo "::set-env name=LIBRARY_PATH::$LIBRARY_PATH" +echo "AJA_DIRECTORY=$AJA_INST" >> $GITHUB_ENV +echo "UG_SKIP_NET_TESTS=1" >> $GITHUB_ENV +echo "CPATH=$CPATH" >> $GITHUB_ENV +echo "LIBRARY_PATH=$LIBRARY_PATH" >> $GITHUB_ENV # libcrypto.pc (and other libcrypto files) is not linked to /usr/local/{lib,include} because conflicting with system libcrypto -echo "::set-env name=PKG_CONFIG_PATH::/usr/local/lib/pkgconfig:/usr/local/opt/qt/lib/pkgconfig:/usr/local/opt/openssl/lib/pkgconfig" -echo "::add-path::/usr/local/opt/qt/bin" +echo "PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/opt/qt/lib/pkgconfig:/usr/local/opt/openssl/lib/pkgconfig" >> $GITHUB_ENV +echo "/usr/local/opt/qt/bin" >> $GITHUB_PATH brew install autoconf automake cppunit libtool pkg-config brew install ffmpeg portaudio sdl2 @@ -57,10 +57,10 @@ if [ -f /var/tmp/sdks/NDISDK_Apple.pkg ]; then export DYLIBBUNDLER_FLAGS="${DYLIBBUNDLER_FLAGS:+$DYLIBBUNDLER_FLAGS }-s /Library/NDI/lib/x64" export LIBRARY_PATH=${LIBRARY_PATH:+"$LIBRARY_PATH:"}/Library/NDI/lib/x64 export MY_DYLD_LIBRARY_PATH="${MY_DYLD_LIBRARY_PATH:+$MY_DYLD_LIBRARY_PATH:}/Library/NDI/lib/x64" - echo "::set-env name=CPATH::$CPATH" - echo "::set-env name=DYLIBBUNDLER_FLAGS::$DYLIBBUNDLER_FLAGS" - echo "::set-env name=LIBRARY_PATH::$LIBRARY_PATH" - echo "::set-env name=MY_DYLD_LIBRARY_PATH::$MY_DYLD_LIBRARY_PATH" + echo "CPATH=$CPATH" >> $GITHUB_ENV + echo "DYLIBBUNDLER_FLAGS=$DYLIBBUNDLER_FLAGS" >> $GITHUB_ENV + echo "LIBRARY_PATH=$LIBRARY_PATH" >> $GITHUB_ENV + echo "MY_DYLD_LIBRARY_PATH=$MY_DYLD_LIBRARY_PATH" >> $GITHUB_ENV cd $TEMP_INST fi