From e91dc9f1bf971a4efc6b38c16f4bd1f37a8bbc63 Mon Sep 17 00:00:00 2001 From: kaliubuntu0206 <139627505+kaliubuntu0206@users.noreply.github.com> Date: Wed, 29 Nov 2023 12:10:49 +0000 Subject: [PATCH] Update mingw cmake version for windows (#8856) From comment https://github.com/ledgerwatch/erigon/issues/8623#issuecomment-1831473288 --- .github/workflows/ci.yml | 4 ++-- .github/workflows/test-integration-caplin.yml | 4 ++-- .github/workflows/test-integration.yml | 4 ++-- README.md | 2 +- erigon-lib/.github/workflows/ci.yml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aea733b4e..c1e1d7341 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -94,8 +94,8 @@ jobs: key: chocolatey-${{ matrix.os }} - name: Install dependencies run: | - choco upgrade mingw -y --no-progress --version 11.2.0.07112021 - choco install cmake -y --no-progress --version 3.23.1 + choco upgrade mingw -y --no-progress --version 13.2.0 + choco install cmake -y --no-progress --version 3.27.8 - name: Build run: .\wmake.ps1 all diff --git a/.github/workflows/test-integration-caplin.yml b/.github/workflows/test-integration-caplin.yml index 84a7c25f8..403641977 100644 --- a/.github/workflows/test-integration-caplin.yml +++ b/.github/workflows/test-integration-caplin.yml @@ -57,8 +57,8 @@ jobs: key: chocolatey-${{ matrix.os }} - name: Install dependencies run: | - choco upgrade mingw -y --no-progress --version 11.2.0.07112021 - choco install cmake -y --no-progress --version 3.23.1 + choco upgrade mingw -y --no-progress --version 13.2.0 + choco install cmake -y --no-progress --version 3.27.8 - name: test-integration-caplin run: cd ./cl/spectest/ && .\wmake.ps1 Tests Mainnet diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index dd90ea727..5471febf7 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -58,8 +58,8 @@ jobs: key: chocolatey-${{ matrix.os }} - name: Install dependencies run: | - choco upgrade mingw -y --no-progress --version 11.2.0.07112021 - choco install cmake -y --no-progress --version 3.23.1 + choco upgrade mingw -y --no-progress --version 13.2.0 + choco install cmake -y --no-progress --version 3.27.8 - name: test-integration run: .\wmake.ps1 test-integration diff --git a/README.md b/README.md index 267857940..6a8ff1a00 100644 --- a/README.md +++ b/README.md @@ -215,7 +215,7 @@ Windows users may run erigon in 3 possible ways: * [Git](https://git-scm.com/downloads) for Windows must be installed. If you're cloning this repository is very likely you already have it * [GO Programming Language](https://golang.org/dl/) must be installed. Minimum required version is 1.20 - * GNU CC Compiler at least version 10 (is highly suggested that you install `chocolatey` package manager - see + * GNU CC Compiler at least version 13 (is highly suggested that you install `chocolatey` package manager - see following point) * If you need to build MDBX tools (i.e. `.\wmake.ps1 db-tools`) then [Chocolatey package manager](https://chocolatey.org/) for Windows must be installed. By Chocolatey you need diff --git a/erigon-lib/.github/workflows/ci.yml b/erigon-lib/.github/workflows/ci.yml index 79ddb7169..bf30c4135 100644 --- a/erigon-lib/.github/workflows/ci.yml +++ b/erigon-lib/.github/workflows/ci.yml @@ -41,8 +41,8 @@ jobs: - name: Install deps if: matrix.os == 'windows-2022' run: | - choco upgrade mingw -y --no-progress --version 11.2.0.07112021 - choco install cmake -y --no-progress --version 3.23.1 + choco upgrade mingw -y --no-progress --version 13.2.0 + choco install cmake -y --no-progress --version 3.27.8 - name: Lint if: matrix.os == 'ubuntu-20.04'