diff options
| author | Chris Denton <chris@chrisdenton.dev> | 2025-02-05 14:22:54 +0000 |
|---|---|---|
| committer | Chris Denton <chris@chrisdenton.dev> | 2025-02-05 14:22:54 +0000 |
| commit | c94ab207fe16b0281117074d31ace7aa5e283158 (patch) | |
| tree | 5a01900dd53487dad8cacebedc4f0a5703ece76f /.github | |
| parent | 820bfffc25fee9866aa8176529091e04b8824f09 (diff) | |
| download | rust-c94ab207fe16b0281117074d31ace7aa5e283158.tar.gz rust-c94ab207fe16b0281117074d31ace7aa5e283158.zip | |
Don't install msys2
windows-msvc doesn't need it and windows-gnu has its own version
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/ci.yml | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a46d123c5d..0934e42b277 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,9 +62,6 @@ jobs: name: ${{ matrix.full_name }} needs: [ calculate_matrix ] runs-on: "${{ matrix.os }}" - defaults: - run: - shell: ${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }} timeout-minutes: 360 env: CI_JOB_NAME: ${{ matrix.name }} @@ -80,22 +77,6 @@ jobs: # Check the `calculate_matrix` job to see how is the matrix defined. include: ${{ fromJSON(needs.calculate_matrix.outputs.jobs) }} steps: - - if: contains(matrix.os, 'windows') - uses: msys2/setup-msys2@v2.22.0 - with: - # i686 jobs use mingw32. x86_64 and cross-compile jobs use mingw64. - msystem: ${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }} - # don't try to download updates for already installed packages - update: false - # don't try to use the msys that comes built-in to the github runner, - # so we can control what is installed (i.e. not python) - release: true - # Inherit the full path from the Windows environment, with MSYS2's */bin/ - # dirs placed in front. This lets us run Windows-native Python etc. - path-type: inherit - install: > - make - - name: disable git crlf conversion run: git config --global core.autocrlf false |