From 8016b74cea415596be405b14067d2938914b2e18 Mon Sep 17 00:00:00 2001 From: Stephan Seitz Date: Sat, 20 Nov 2021 18:05:46 +0100 Subject: ci: Try out windows-2022 --- .github/workflows/check-query-files-and-compilation.yml | 14 +++++++------- scripts/ci-install-windows-2022.sh | 5 +++++ scripts/ci-install-windows-latest.sh | 5 ----- 3 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 scripts/ci-install-windows-2022.sh delete mode 100644 scripts/ci-install-windows-latest.sh diff --git a/.github/workflows/check-query-files-and-compilation.yml b/.github/workflows/check-query-files-and-compilation.yml index d89b09fa5..df7e54477 100644 --- a/.github/workflows/check-query-files-and-compilation.yml +++ b/.github/workflows/check-query-files-and-compilation.yml @@ -7,14 +7,14 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest, windows-2022, macos-latest] cc: [ gcc, clang ] exclude: - os: macos-latest cc: gcc include: - - os: windows-latest + - os: windows-2022 cc: cl - os: macos-latest @@ -37,17 +37,17 @@ jobs: bash ./scripts/ci-install-${{ matrix.os }}.sh - name: Compile parsers Unix like - if: matrix.os != 'windows-latest' + if: matrix.os != 'windows-2022' run: | nvim --headless -c "TSInstallSync all" -c "q" - name: Compile parsers Windows - if: matrix.os == 'windows-latest' + if: matrix.os == 'windows-2022' run: | Neovim\\bin\\nvim.exe --headless -c "TSInstallSync all" -c "q" - name: Post compile Windows - if: matrix.os == 'windows-latest' + if: matrix.os == 'windows-2022' run: cp -r ~/AppData/Local/nvim/pack/nvim-treesitter/start/nvim-treesitter/parser/* parser shell: bash @@ -57,13 +57,13 @@ jobs: path: parser/* - name: Check query files (Unix) - if: matrix.os != 'windows-latest' + if: matrix.os != 'windows-2022' env: ALLOWED_INSTALLATION_FAILURES: haskell run: nvim --headless -c "luafile ./scripts/check-queries.lua" -c "q" - name: Check query files (Windows) - if: matrix.os == 'windows-latest' + if: matrix.os == 'windows-2022' env: ALLOWED_INSTALLATION_FAILURES: haskell run: Neovim\\bin\\nvim.exe --headless -c "luafile ./scripts/check-queries.lua" -c "q" diff --git a/scripts/ci-install-windows-2022.sh b/scripts/ci-install-windows-2022.sh new file mode 100644 index 000000000..6af5b0ce9 --- /dev/null +++ b/scripts/ci-install-windows-2022.sh @@ -0,0 +1,5 @@ +curl -L https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-win64.zip -o nvim-win64.zip +unzip nvim-win64 +mkdir -p ~/AppData/Local/nvim/pack/nvim-treesitter/start +mkdir -p ~/AppData/Local/nvim-data +cp -r $(pwd) ~/AppData/Local/nvim/pack/nvim-treesitter/start diff --git a/scripts/ci-install-windows-latest.sh b/scripts/ci-install-windows-latest.sh deleted file mode 100644 index 6af5b0ce9..000000000 --- a/scripts/ci-install-windows-latest.sh +++ /dev/null @@ -1,5 +0,0 @@ -curl -L https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-win64.zip -o nvim-win64.zip -unzip nvim-win64 -mkdir -p ~/AppData/Local/nvim/pack/nvim-treesitter/start -mkdir -p ~/AppData/Local/nvim-data -cp -r $(pwd) ~/AppData/Local/nvim/pack/nvim-treesitter/start -- cgit v1.2.3-70-g09d2