diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 19ba6af..9ab3b83 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -47,10 +47,10 @@ jobs: - name: Build depend shell: msys2 {0} run: | - pacman --noconfirm -S make + pacman --noconfirm -S make cmake autoconf automake bison diffutils libtool texinfo xmlto + pacman --noconfirm -S base-devel msys2-devel mingw-w64-{x86_64,i686}-toolchain cd depend - export PATH=$PATH:$Qt6_DIR/../../Tools/mingw810_64/bin - ls -l $Qt6_DIR/../../Tools/mingw810_64/bin + export PATH=/c/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/bin:$PATH ./build_ms.sh - name: Build all @@ -62,13 +62,14 @@ jobs: ./tools/sed/sed.exe -i "s/QT_TOOLS_DIR=C:\/Qt\/Qt6.2.0\/Tools\/mingw810_32\/bin/QT_TOOLS_DIR=C:\/ProgramData\/Chocolatey\/lib\/mingw\/tools\/install\/mingw64\/bin/g" ./build_setup.bat ./tools/sed/sed.exe -i "s/FREETPE2_DIR=D:\\ttfviewer\\depend\\freetype/FREETPE2_DIR=D:\\freetype/g" ./partform_win32.pri ./build_setup.bat + dir - name: Upload build asserts uses: actions/upload-artifact@v3.1.3 with: name: TTFviewer_windows path: | - ./InnoSetup/TTFviewer_setup.exe + ./Makefile.Release - name: Run tests run: |