@@ -30,28 +30,31 @@ jobs:
3030 shell : bash
3131 env :
3232 _QT_VERSION : " 5.15.13"
33- _QT_NAME : mingw141_${{ matrix.profile }}-redpanda
34- _MINGW_LITE_RELEASE : " 14.1.0-r1"
33+ _REDPANDA_QT_RELEASE : " 5.15.13+redpanda1"
34+ _QT_NAME : mingw141_${{ matrix.profile }}
35+ _MINGW_LITE_RELEASE : " 14.1.0-r2"
3536
3637 steps :
3738 - uses : actions/checkout@v2
3839
3940 - name : Setup toolchain
4041 run : |
41- curl -LO https://github.com/redpanda-cpp/mingw-lite/releases/download/$_MINGW_LITE_RELEASE/mingw${{ matrix.profile }}-$_MINGW_LITE_RELEASE.7z
42- 7z x mingw${{ matrix.profile }}-$_MINGW_LITE_RELEASE.7z
42+ curl -LO "https://github.com/redpanda-cpp/mingw-lite/releases/download/$_MINGW_LITE_RELEASE/mingw${{ matrix.profile }}-$_MINGW_LITE_RELEASE.7z"
43+ 7z x "mingw${{ matrix.profile }}-$_MINGW_LITE_RELEASE.7z"
44+ mkdir -p "/c/Qt/$_REDPANDA_QT_RELEASE"
45+ mv "mingw${{ matrix.arch }}" "/c/Qt/$_REDPANDA_QT_RELEASE/$_QT_NAME"
4346
4447 - name : Prepare source
4548 run : |
46- git clone https://github.com/qt/qtsvg.git --branch=v$_QT_VERSION-lts-lgpl --depth=1
47- git clone https://github.com/qt/qttools.git --branch=v$_QT_VERSION-lts-lgpl --depth=1
49+ git clone https://github.com/qt/qtsvg.git --branch=" v$_QT_VERSION-lts-lgpl" --depth=1
50+ git clone https://github.com/qt/qttools.git --branch=" v$_QT_VERSION-lts-lgpl" --depth=1
4851
4952 - name : Build
5053 run : |
51- export PATH="/c/Qt/$_QT_VERSION /$_QT_NAME/bin:$PWD/mingw${{ matrix.arch }} /bin:$PATH"
54+ export PATH="/c/Qt/$_REDPANDA_QT_RELEASE /$_QT_NAME/bin:$PATH"
5255
5356 ./configure.bat \
54- -prefix /c/Qt/$_QT_VERSION /$_QT_NAME -release \
57+ -prefix " /c/Qt/$_REDPANDA_QT_RELEASE /$_QT_NAME" -release \
5558 -opensource -confirm-license \
5659 -release -optimize-size -static -static-runtime -platform win32-g++ \
5760 -opengl desktop -no-angle -no-icu -qt-zlib -qt-pcre -qt-libpng -qt-libjpeg -qt-freetype -no-fontconfig -qt-harfbuzz -no-ssl -no-openssl \
@@ -76,12 +79,12 @@ jobs:
7679 }
7780 popd
7881
79- 7z a -t7z -mx=9 -ms=on -mqs=on -mf=BCJ2 -m0=LZMA2:d=64m:fb=273:c=256m $_QT_NAME.7z /c/Qt/$_QT_VERSION
82+ 7z a -t7z -mx=9 -ms=on -mqs=on -mf=BCJ2 -m0=LZMA2:d=64m:fb=273:c=256m " $_QT_NAME.7z" " /c/Qt/$_REDPANDA_QT_RELEASE"
8083
8184 - name : Upload
8285 uses : actions/upload-artifact@v2
8386 with :
84- name : Qt ${{ env._QT_VERSION }} - ${{ env._QT_NAME }}
87+ name : Qt ${{ env._REDPANDA_QT_RELEASE }} - ${{ env._QT_NAME }}
8588 path : ${{ env._QT_NAME }}.7z
8689
8790 - name : Release
0 commit comments