From 7b322bb3b479c18f56f863acd7b73e3a720492d4 Mon Sep 17 00:00:00 2001 From: Boog900 <54e72d8a-345f-4599-bd90-c6b9bc7d0ec5@aleeas.com> Date: Tue, 8 Oct 2024 16:10:31 +0100 Subject: [PATCH 1/5] remove windows CI workaround --- .github/workflows/ci.yml | 48 ---------------------------------------- 1 file changed, 48 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8c2271d5d..eaa45458b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,22 +53,6 @@ jobs: strategy: matrix: os: [windows-latest, macos-latest, ubuntu-latest] - include: - - os: windows-latest - shell: msys2 {0} - # GNU Windows is used as we need - # `unistd.h` and more in `cryptonight/`. - rust: stable-x86_64-pc-windows-gnu - - os: macos-latest - shell: bash - rust: stable - - os: ubuntu-latest - shell: bash - rust: stable - - defaults: - run: - shell: ${{ matrix.shell }} steps: - name: Checkout @@ -91,38 +75,6 @@ jobs: - name: Download monerod uses: ./.github/actions/monerod-download - # Packages other than `Boost` used by `Monero` are listed here. - # https://github.com/monero-project/monero/blob/c444a7e002036e834bfb4c68f04a121ce1af5825/.github/workflows/build.yml#L71 - - - name: Install dependencies (Linux) - if: matrix.os == 'ubuntu-latest' - run: sudo apt install -y libboost-dev - - - name: Install dependencies (macOS) - if: matrix.os == 'macos-latest' - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install boost - - - name: Install dependencies (Windows) - if: matrix.os == 'windows-latest' - uses: msys2/setup-msys2@v2 - with: - path-type: inherit - update: true - install: mingw-w64-x86_64-toolchain mingw-w64-x86_64-boost msys2-runtime-devel git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja - - # HACK: 2024-05-14 - # GCC 14+ fails to build `lmdb-master-sys` with no clear error message: - # - # - # - MSYS2 repos carry older versions of packages - # - pacman lets us manually downgrade from package files - # - Note that `gcc` requires `gcc-libs` - - name: Downgrade to GCC 13.2 (Windows) - if: matrix.os == 'windows-latest' - run: | - wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-13.2.0-6-any.pkg.tar.zst https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libs-13.2.0-6-any.pkg.tar.zst - pacman -U --noconfirm mingw-w64-x86_64-gcc-13.2.0-6-any.pkg.tar.zst mingw-w64-x86_64-gcc-libs-13.2.0-6-any.pkg.tar.zst - - name: Documentation run: cargo doc --workspace --all-features --no-deps From dec5a79a5258345ee058ebce02cf30a226c02f9b Mon Sep 17 00:00:00 2001 From: Boog900 <54e72d8a-345f-4599-bd90-c6b9bc7d0ec5@aleeas.com> Date: Tue, 8 Oct 2024 16:14:36 +0100 Subject: [PATCH 2/5] add back in stable line --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eaa45458b..f23a314a2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,7 +63,7 @@ jobs: - name: Install Rust uses: dtolnay/rust-toolchain@master with: - toolchain: ${{ matrix.rust }} + toolchain: stable components: clippy - name: Cache From a3939b585daf35dd1595765c7eaa2ec7d985c92e Mon Sep 17 00:00:00 2001 From: Boog900 <54e72d8a-345f-4599-bd90-c6b9bc7d0ec5@aleeas.com> Date: Tue, 8 Oct 2024 16:28:18 +0100 Subject: [PATCH 3/5] add msbuild tools --- .github/workflows/ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f23a314a2..5c358455f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,6 +75,12 @@ jobs: - name: Download monerod uses: ./.github/actions/monerod-download + - name: Add msbuild to PATH + if: matrix.os == 'windows-latest' + uses: microsoft/setup-msbuild@v2 + with: + vs-version: '[16.4,16.5)' + - name: Documentation run: cargo doc --workspace --all-features --no-deps From 1bf8dcca5117204f9989d8d951be0ccd66a86330 Mon Sep 17 00:00:00 2001 From: Boog900 <54e72d8a-345f-4599-bd90-c6b9bc7d0ec5@aleeas.com> Date: Tue, 8 Oct 2024 17:27:56 +0100 Subject: [PATCH 4/5] remove version --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5c358455f..620a7bf4c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,8 +78,6 @@ jobs: - name: Add msbuild to PATH if: matrix.os == 'windows-latest' uses: microsoft/setup-msbuild@v2 - with: - vs-version: '[16.4,16.5)' - name: Documentation run: cargo doc --workspace --all-features --no-deps From 603bc504a5b0d355b3b7c12181da801bbaae5ae4 Mon Sep 17 00:00:00 2001 From: Boog900 <54e72d8a-345f-4599-bd90-c6b9bc7d0ec5@aleeas.com> Date: Tue, 8 Oct 2024 17:36:27 +0100 Subject: [PATCH 5/5] add back version --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 620a7bf4c..c67b49337 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,7 +78,8 @@ jobs: - name: Add msbuild to PATH if: matrix.os == 'windows-latest' uses: microsoft/setup-msbuild@v2 - + with: + vs-version: '[16.0,17.0)' - name: Documentation run: cargo doc --workspace --all-features --no-deps