From 572cd0277f14c600efacabd5866ff1e80b79cff5 Mon Sep 17 00:00:00 2001 From: Ji Bin Date: Tue, 7 Jun 2022 19:56:05 +0800 Subject: [PATCH] [skip e2e] Lock msys package's versions (#17414) Signed-off-by: Ji Bin --- .github/workflows/code-checker.yaml | 2 +- scripts/install_deps_msys.sh | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/code-checker.yaml b/.github/workflows/code-checker.yaml index 306ed6db59..8ee676ac3a 100644 --- a/.github/workflows/code-checker.yaml +++ b/.github/workflows/code-checker.yaml @@ -176,7 +176,7 @@ jobs: key: ${{ runner.os }}-ccache-${{ hashFiles('internal/core/**') }} restore-keys: ${{ runner.os }}-ccache- - name: Configure Toolchain - uses: msys2/setup-msys2@v2 + uses: msys2/setup-msys2@v2.10.3 with: msystem: mingw64 - name: Install Deps diff --git a/scripts/install_deps_msys.sh b/scripts/install_deps_msys.sh index bc928c178d..d99cc6cced 100644 --- a/scripts/install_deps_msys.sh +++ b/scripts/install_deps_msys.sh @@ -20,12 +20,9 @@ pacman -S --noconfirm --needed \ mingw-w64-x86_64-clang-tools-extra \ mingw-w64-x86_64-python2 \ mingw-w64-x86_64-diffutils \ - mingw-w64-x86_64-arrow - -# workaround for install older packages -pacman -U --noconfirm \ - https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-go-1.17-1-any.pkg.tar.zst \ - https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-rocksdb-6.26.1-1-any.pkg.tar.zst + mingw-w64-x86_64-arrow \ + mingw-w64-x86_64-go \ + mingw-w64-x86_64-rocksdb # dummy empty dl, TODO: remove later