Skip to content

Commit 1d4b40b

Browse files
committed
github-actions/win32: use powershell env expansion
1 parent bed0e07 commit 1d4b40b

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

.github/workflows/build.msvc.windows.workflow.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,14 @@ jobs:
8989
- name: "Set shared/dynamic Qt location (v${{ env.QT_VERSION }}, ${{ matrix.arch_name }})"
9090
if: ${{ matrix.linking == 'dynamic' }}
9191
run: |
92-
echo QT5_BIN_DIR=${{ env.Qt5_DIR }}/bin >> %GITHUB_ENV%
92+
echo QT5_BIN_DIR=${{ env.Qt5_DIR }}/bin >> $env:GITHUB_ENV
9393
9494
# Add MSYS2's /usr/bin to the PATH.
9595
# This allows vcpkg's build of libpng[apng] to succeed with adding the library prefix.
9696
# (It requires awk to correctly regen the source files...)
9797
- name: Add msys2 to system PATH
9898
run: |
99-
echo C:\msys64\usr\bin >> %GITHUB_PATH%
99+
echo C:\msys64\usr\bin >> $env:GITHUB_PATH
100100
101101
- name: Set vcpkg's response file path used as part of cache's key.
102102
uses: lukka/set-shell-env@master
@@ -132,27 +132,27 @@ jobs:
132132
- name: Set paths to newly installed static Qt libraries
133133
if: ${{ matrix.linking == 'static' }}
134134
run: |
135-
echo QT5_BIN_DIR=${{ matrix.QT5_BIN_DIR }} >> %GITHUB_ENV%
135+
echo QT5_BIN_DIR=${{ matrix.QT5_BIN_DIR }} >> $env:GITHUB_ENV
136136
137137
## Build time!
138138

139139
# Are we releasing?
140140
- name: Set CEmu version for release (if applicable)
141141
run: |
142-
echo CEMU_VERSION=${{ github.event.release.tag_name }} >> %GITHUB_ENV%
142+
echo CEMU_VERSION=${{ github.event.release.tag_name }} >> $env:GITHUB_ENV
143143
echo Using tagged version :${{ env.CEMU_VERSION }}
144144
if: "github.event.release.tag_name"
145145

146146
- name: Set CEmu version for development (if applicable)
147147
run: |
148-
echo CEMU_VERSION= >> %GITHUB_ENV%
148+
echo CEMU_VERSION= >> $env:GITHUB_ENV
149149
echo "No version defined, using empty version '${{ env.CEMU_VERSION }}'"
150150
if: "!github.event.release.tag_name"
151151

152152
# Set dynamic, matrix-controlled env var
153153
- name: Set extra static MSBuild flag, if applicable
154154
run: |
155-
echo LINKING_EXTRA_MSBUILD_ARGS=/p:VcpkgTriplet=${{ matrix.arch }}-windows-static /p:VcpkgEnabled=true >> %GITHUB_ENV%
155+
echo LINKING_EXTRA_MSBUILD_ARGS=/p:VcpkgTriplet=${{ matrix.arch }}-windows-static /p:VcpkgEnabled=true >> $env:GITHUB_ENV
156156
echo "Detected static linking, adding LINKING_EXTRA_MSBUILD_ARGS = '${{ env.LINKING_EXTRA_MSBUILD_ARGS }}'"
157157
if: "matrix.linking == 'static'"
158158

@@ -238,9 +238,9 @@ jobs:
238238

239239
- name: Set Qt location (v5.15.0, 32-bit)
240240
run: |
241-
echo QT5_BIN_DIR_DYNAMIC_32=${{ env.Qt5_DIR }}/bin >> %GITHUB_ENV%
242-
echo QT_PLUGIN_PATH_DYNAMIC_32=${{ env.QT_PLUGIN_PATH }} >> %GITHUB_ENV%
243-
echo QML2_IMPORT_PATH_DYNAMIC_32=${{ env.QML2_IMPORT_PATH }} >> %GITHUB_ENV%
241+
echo QT5_BIN_DIR_DYNAMIC_32=${{ env.Qt5_DIR }}/bin >> $env:GITHUB_ENV
242+
echo QT_PLUGIN_PATH_DYNAMIC_32=${{ env.QT_PLUGIN_PATH }} >> $env:GITHUB_ENV
243+
echo QML2_IMPORT_PATH_DYNAMIC_32=${{ env.QML2_IMPORT_PATH }} >> $env:GITHUB_ENV
244244
245245
- name: Install Qt (v5.15.0, 64-bit)
246246
uses: jurplel/install-qt-action@v2
@@ -254,9 +254,9 @@ jobs:
254254

255255
- name: Set Qt location (v5.15.0, 64-bit)
256256
run: |
257-
echo QT5_BIN_DIR_DYNAMIC_64=${{ env.Qt5_DIR }}/bin >> %GITHUB_ENV%
258-
echo QT_PLUGIN_PATH_DYNAMIC_64=${{ env.QT_PLUGIN_PATH }} >> %GITHUB_ENV%
259-
echo QML2_IMPORT_PATH_DYNAMIC_64=${{ env.QML2_IMPORT_PATH }} >> %GITHUB_ENV%
257+
echo QT5_BIN_DIR_DYNAMIC_64=${{ env.Qt5_DIR }}/bin >> $env:GITHUB_ENV
258+
echo QT_PLUGIN_PATH_DYNAMIC_64=${{ env.QT_PLUGIN_PATH }} >> $env:GITHUB_ENV
259+
echo QML2_IMPORT_PATH_DYNAMIC_64=${{ env.QML2_IMPORT_PATH }} >> $env:GITHUB_ENV
260260
261261
# Install Python + modules to run our helper script
262262
- name: Set up Python 3.8
@@ -277,8 +277,8 @@ jobs:
277277
# TODO: automate this somehow?
278278
- name: Set paths to newly installed static Qt libraries
279279
run: |
280-
echo QT5_BIN_DIR_STATIC_32=C:\Qt\Qt5.15.0-static\bin >> %GITHUB_ENV%
281-
echo QT5_BIN_DIR_STATIC_64=C:\Qt\Qt5.15.0x64-static\bin >> %GITHUB_ENV%
280+
echo QT5_BIN_DIR_STATIC_32=C:\Qt\Qt5.15.0-static\bin >> $env:GITHUB_ENV
281+
echo QT5_BIN_DIR_STATIC_64=C:\Qt\Qt5.15.0x64-static\bin >> $env:GITHUB_ENV
282282
283283
- name: "Download artifacts: Dynamic/Shared (Debug + Release, 32-bit)"
284284
uses: actions/download-artifact@v2

0 commit comments

Comments
 (0)