mirror of
https://github.com/Xaymar/obs-StreamFX
synced 2024-12-28 02:21:25 +00:00
ci: Attempt to fix env issues
This commit is contained in:
parent
12434db5e4
commit
ceca90fa38
1 changed files with 8 additions and 8 deletions
16
.github/workflows/main.yml
vendored
16
.github/workflows/main.yml
vendored
|
@ -168,9 +168,9 @@ jobs:
|
|||
else
|
||||
buildspecdata=(0000-00-00 "about:blank" "00000000000000000000000000000000")
|
||||
fi
|
||||
echo "obs_deps_version::${buildspecdata[0]}" >> $GITHUB_ENV
|
||||
echo "obs_deps_url::${buildspecdata[1]}" >> $GITHUB_ENV
|
||||
echo "obs_deps_hash::${buildspecdata[2]}" >> $GITHUB_ENV
|
||||
echo "obs_deps_version::\"${buildspecdata[0]}\"" >> $GITHUB_ENV
|
||||
echo "obs_deps_url::\"${buildspecdata[1]}\"" >> $GITHUB_ENV
|
||||
echo "obs_deps_hash::\"${buildspecdata[2]}\"" >> $GITHUB_ENV
|
||||
|
||||
# Qt Version
|
||||
if [[ "${{ matrix.runner }}" = windows* ]]; then
|
||||
|
@ -180,12 +180,12 @@ jobs:
|
|||
else
|
||||
buildspecdata=(0000-00-00 "about:blank" "00000000000000000000000000000000")
|
||||
fi
|
||||
echo "qt_version::${buildspecdata[0]}" >> $GITHUB_ENV
|
||||
echo "qt_url::${buildspecdata[1]}" >> $GITHUB_ENV
|
||||
echo "qt_hash::${buildspecdata[2]}" >> $GITHUB_ENV
|
||||
echo "qt_version::\"${buildspecdata[0]}\"" >> $GITHUB_ENV
|
||||
echo "qt_url::\"${buildspecdata[1]}\"" >> $GITHUB_ENV
|
||||
echo "qt_hash::\"${buildspecdata[2]}\"" >> $GITHUB_ENV
|
||||
|
||||
# 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
|
||||
if [[ "${{ matrix.CMAKE_GENERATOR }}" != "" ]]; then
|
||||
|
@ -218,7 +218,7 @@ jobs:
|
|||
with:
|
||||
path: "${{ github.workspace }}/build/qt"
|
||||
key: "${{ matrix.runner }}-qt${{ matrix.qt }}_${{ env.qt_version }}_${{ env.qt_hash }}-${{ env.CACHE_VERSION }}"
|
||||
- name: "Dependency: Qt "
|
||||
- name: "Dependency: Qt"
|
||||
id: qt
|
||||
if: ${{ startsWith( matrix.runner, 'ubuntu' ) || (steps.qt-cache.outputs.cache-hit != 'true') }}
|
||||
shell: bash
|
||||
|
|
Loading…
Reference in a new issue