diff options
| author | MSP-Greg <Greg.mpls@gmail.com> | 2023-12-03 18:53:28 +0900 |
|---|---|---|
| committer | NAKAMURA Usaku <usa@ruby-lang.org> | 2023-12-03 18:53:28 +0900 |
| commit | 902cbd05b6f2a306f003a2329db20c3e08f86992 (patch) | |
| tree | 48873eec62c65a136cb2ca0659836e264405ce66 /.github/workflows | |
| parent | 1cae5e7ceaca7304108fdec35d4858a9e4ff7fe0 (diff) | |
[CI] windows.yml - use MSYS2 bison instead of Chocolatey
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/windows.yml | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 91ef04a0f8..3d434d352b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -42,8 +42,7 @@ jobs: with: update: true install: >- - patch - if: ${{ matrix.os != 'windows-2019' }} + bison patch - name: patch path shell: msys2 {0} run: echo PATCH=$(cygpath -wa $(command -v patch)) >> $GITHUB_ENV @@ -58,19 +57,6 @@ jobs: - name: Install libraries with vcpkg run: | vcpkg --triplet x64-windows install openssl readline zlib - - uses: actions/cache@v3 - with: - path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey - key: ${{ runner.os }}-chocolatey-${{ matrix.os }}-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-chocolatey-${{ matrix.os }}- - ${{ runner.os }}-chocolatey- - - name: Install libraries with chocolatey - run: | - # Using Choco-Install for retries, but it doesn't detect failures properly - # if you pass multiple package names in a single command. - Choco-Install -PackageName winflexbison3 - shell: pwsh - name: git config run: | git config --global core.autocrlf false @@ -87,7 +73,9 @@ jobs: - name: setup env # %TEMP% is inconsistent with %TMP% and test-all expects they are consistent. # https://github.com/actions/virtual-environments/issues/712#issuecomment-613004302 + # msys2/setup-msys2 installs MSYS2 to D:/a/_temp/msys64/usr/bin run: | + set Path=D:/a/_temp/msys64/usr/bin;%Path% set | C:\msys64\usr\bin\sort > old.env call %VCVARS% set TMP=%USERPROFILE%\AppData\Local\Temp @@ -105,7 +93,7 @@ jobs: - run: nmake extract-extlibs - run: nmake env: - YACC: win_bison + YACC: bison.exe - run: nmake test timeout-minutes: 5 - run: nmake test-all |