etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-12-28 18:41:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

ci: Attempt to fix env issues

Browse source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2023-05-13 20:51:45 +02:00 committed by Xaymar
parent 12434db5e4
commit ceca90fa38
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
.github/workflows/main.yml vendored
View file

@ -168,9 +168,9 @@ jobs:
else else
buildspecdata=(0000-00-00 "about:blank" "00000000000000000000000000000000") buildspecdata=(0000-00-00 "about:blank" "00000000000000000000000000000000")
fi fi
echo "obs_deps_version::${buildspecdata[0]}" >> $GITHUB_ENV echo "obs_deps_version::\"${buildspecdata[0]}\"" >> $GITHUB_ENV
echo "obs_deps_url::${buildspecdata[1]}" >> $GITHUB_ENV echo "obs_deps_url::\"${buildspecdata[1]}\"" >> $GITHUB_ENV
echo "obs_deps_hash::${buildspecdata[2]}" >> $GITHUB_ENV echo "obs_deps_hash::\"${buildspecdata[2]}\"" >> $GITHUB_ENV
# Qt Version # Qt Version
if [[ "${{ matrix.runner }}" = windows* ]]; then if [[ "${{ matrix.runner }}" = windows* ]]; then
@ -180,12 +180,12 @@ jobs:
else else
buildspecdata=(0000-00-00 "about:blank" "00000000000000000000000000000000") buildspecdata=(0000-00-00 "about:blank" "00000000000000000000000000000000")
fi fi
echo "qt_version::${buildspecdata[0]}" >> $GITHUB_ENV echo "qt_version::\"${buildspecdata[0]}\"" >> $GITHUB_ENV
echo "qt_url::${buildspecdata[1]}" >> $GITHUB_ENV echo "qt_url::\"${buildspecdata[1]}\"" >> $GITHUB_ENV
echo "qt_hash::${buildspecdata[2]}" >> $GITHUB_ENV echo "qt_hash::\"${buildspecdata[2]}\"" >> $GITHUB_ENV
# libOBS Version # libOBS Version
echo "obs_version::$(cd "${{ github.workspace }}/third-party/obs-studio" && git describe --tags --long)" echo "obs_version::\"$(cd "${{ github.workspace }}/third-party/obs-studio" && git describe --tags --long)\""
# CMake Flags # CMake Flags
if [[ "${{ matrix.CMAKE_GENERATOR }}" != "" ]]; then if [[ "${{ matrix.CMAKE_GENERATOR }}" != "" ]]; then
@ -218,7 +218,7 @@ jobs:
with: with:
path: "${{ github.workspace }}/build/qt" path: "${{ github.workspace }}/build/qt"
key: "${{ matrix.runner }}-qt${{ matrix.qt }}_${{ env.qt_version }}_${{ env.qt_hash }}-${{ env.CACHE_VERSION }}" key: "${{ matrix.runner }}-qt${{ matrix.qt }}_${{ env.qt_version }}_${{ env.qt_hash }}-${{ env.CACHE_VERSION }}"
- name: "Dependency: Qt " - name: "Dependency: Qt"
id: qt id: qt
if: ${{ startsWith( matrix.runner, 'ubuntu' ) || (steps.qt-cache.outputs.cache-hit != 'true') }} if: ${{ startsWith( matrix.runner, 'ubuntu' ) || (steps.qt-cache.outputs.cache-hit != 'true') }}
shell: bash shell: bash