From 6c9d919fa0b34016d7ded228ce5641104c8c47cc Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Wed, 20 Nov 2024 03:45:46 +0900 Subject: [PATCH] ci: Avoid buggy behavior of cygwin --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f362d2de..bb55563c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,6 +77,12 @@ jobs: runs-on: ${{ matrix.os }} timeout-minutes: 60 steps: + - uses: taiki-e/checkout-action@v1 + # cross attempts to install rust-src when Cargo.toml is available even if `cross --version` + - run: rm Cargo.toml + - name: Generate tool list + id: tool-list + run: tools/ci/tool-list.sh "${{ matrix.tool }}" "${{ matrix.os }}" "${{ matrix.bash }}" >>"${GITHUB_OUTPUT}" - run: | printf '%s\n' 'C:\msys64\mingw32\bin' >>"${GITHUB_PATH}" printf '%s\n' 'C:\msys64\usr\bin' >>"${GITHUB_PATH}" @@ -86,12 +92,6 @@ jobs: printf '%s\n' 'C:\tools\cygwin\bin' >>"${GITHUB_PATH}" printf '%s\n' 'C:\tools\cygwin\usr\bin' >>"${GITHUB_PATH}" if: matrix.bash == 'cygwin' - - uses: taiki-e/checkout-action@v1 - # cross attempts to install rust-src when Cargo.toml is available even if `cross --version` - - run: rm Cargo.toml - - name: Generate tool list - id: tool-list - run: tools/ci/tool-list.sh "${{ matrix.tool }}" "${{ matrix.os }}" "${{ matrix.bash }}" >>"${GITHUB_OUTPUT}" - run: env - uses: ./ with: