diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-06-19 16:12:52 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-06-19 16:12:52 -0500 |
| commit | 9580c19da3a7842152efe19d4225836a4f1e98d5 (patch) | |
| tree | 01f98c1395f06ceb4140b1a7f5b7640ae563578f | |
| parent | c9ee76c2ee062dc9dc9488a68a8312622a5b35e0 (diff) | |
| parent | c6d5c5dc3a6c70ce7b69a4fc276c5b55c8388995 (diff) | |
| download | monzero-gui-9580c19da3a7842152efe19d4225836a4f1e98d5.tar.gz monzero-gui-9580c19da3a7842152efe19d4225836a4f1e98d5.tar.xz monzero-gui-9580c19da3a7842152efe19d4225836a4f1e98d5.zip | |
Merge pull request #2937
c6d5c5d workflows: update msys2 setup action v0 -> v1 (selsta)
| -rw-r--r-- | .github/workflows/build.yml | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5ee03506..5d0dd1d3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,19 +63,21 @@ jobs: - name: "cmake" cmd: "USE_SINGLE_BUILDDIR=ON DEV_MODE=ON make release-win64 -j2" name: build-windows-${{ matrix.toolchain.name }} + defaults: + run: + shell: msys2 {0} steps: - uses: actions/checkout@v1 with: submodules: recursive - - uses: eine/setup-msys2@v0 + - uses: eine/setup-msys2@v1 with: update: true - - name: install monero dependencies - run: msys2do pacman -S --noconfirm mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb git mingw-w64-x86_64-qt5 mingw-w64-x86_64-libgcrypt - - name: disable qtquickcompiler - run: msys2do sed -i s/CONFIG\ +=\ qtquickcompiler// monero-wallet-gui.pro + install: mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb git mingw-w64-x86_64-qt5 mingw-w64-x86_64-libgcrypt - name: build - run: msys2do ${{ matrix.toolchain.cmd }} + run: | + sed -i 's/CONFIG\ +=\ qtquickcompiler//' monero-wallet-gui.pro + ${{ matrix.toolchain.cmd }} - name: test qml - run: msys2do build/release/bin/monero-wallet-gui --test-qml + run: build/release/bin/monero-wallet-gui --test-qml |