Skip to content

Commit 6b773e2

Browse files
committed
Revert "Disable windows CI; it's failing and I no longer have patience to fight it"
This reverts commit 422e150.
1 parent 422e150 commit 6b773e2

File tree

4 files changed

+104
-104
lines changed

4 files changed

+104
-104
lines changed

.github/workflows/ci.yml

Lines changed: 101 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -172,108 +172,108 @@ jobs:
172172
YCM_TESTRUN=1 python3 build.py --clang-completer --clang-tidy --valgrind
173173
python3 run_tests.py --valgrind --skip-build --no-flake8 --quiet
174174
175-
# windows:
176-
# strategy:
177-
# fail-fast: false
178-
# matrix:
179-
# runs-on: [ windows-2022 ]
180-
# benchmark: [ true, false ]
181-
# python-arch: [ 'x64', 'x86' ]
182-
# msvc: [ 17 ]
183-
# exclude:
184-
# - runs-on: windows-2022
185-
# benchmark: true
186-
# python-arch: 'x86'
187-
# include:
188-
# - runs-on: windows-2019
189-
# benchmark: false
190-
# python-arch: 'x64'
191-
# msvc: 16
192-
# runs-on: ${{ matrix.runs-on }}
193-
# env:
194-
# USE_CLANG_COMPLETER: ${{ matrix.libclang }}
195-
# COVERAGE: ${{ !matrix.benchmark }}
196-
# name: "Windows MSVC ${{ matrix.msvc }} ${{ matrix.python-arch }} - ${{ matrix.benchmark && 'C++ Benchmark' || 'test run' }}"
197-
# steps:
198-
# - uses: actions/checkout@v4
199-
# with:
200-
# submodules: recursive
201-
# fetch-depth: 0
175+
windows:
176+
strategy:
177+
fail-fast: false
178+
matrix:
179+
runs-on: [ windows-2022 ]
180+
benchmark: [ true, false ]
181+
python-arch: [ 'x64', 'x86' ]
182+
msvc: [ 17 ]
183+
exclude:
184+
- runs-on: windows-2022
185+
benchmark: true
186+
python-arch: 'x86'
187+
include:
188+
- runs-on: windows-2019
189+
benchmark: false
190+
python-arch: 'x64'
191+
msvc: 16
192+
runs-on: ${{ matrix.runs-on }}
193+
env:
194+
USE_CLANG_COMPLETER: ${{ matrix.libclang }}
195+
COVERAGE: ${{ !matrix.benchmark }}
196+
name: "Windows MSVC ${{ matrix.msvc }} ${{ matrix.python-arch }} - ${{ matrix.benchmark && 'C++ Benchmark' || 'test run' }}"
197+
steps:
198+
- uses: actions/checkout@v4
199+
with:
200+
submodules: recursive
201+
fetch-depth: 0
202202

203-
# - uses: actions/cache@v4
204-
# if: matrix.libclang == true && matrix.benchmark == false
205-
# with:
206-
# key: v3-libclang-${{ runner.os }}-${{ hashFiles( 'cpp/ycm/CMakeLists.txt' ) }}
207-
# restore-keys: |
208-
# v3-libclang-${{ runner.os }}-
209-
# v2-libclang-${{ runner.os }}-${{ hashFiles( 'cpp/ycm/CMakeLists.txt' ) }}
210-
# v2-libclang-${{ runner.os }}-
211-
# v1-libclang-${{ runner.os }}-
212-
# path: |
213-
# clang_archives
214-
# name: Cache libclang
203+
- uses: actions/cache@v4
204+
if: matrix.libclang == true && matrix.benchmark == false
205+
with:
206+
key: v3-libclang-${{ runner.os }}-${{ hashFiles( 'cpp/ycm/CMakeLists.txt' ) }}
207+
restore-keys: |
208+
v3-libclang-${{ runner.os }}-
209+
v2-libclang-${{ runner.os }}-${{ hashFiles( 'cpp/ycm/CMakeLists.txt' ) }}
210+
v2-libclang-${{ runner.os }}-
211+
v1-libclang-${{ runner.os }}-
212+
path: |
213+
clang_archives
214+
name: Cache libclang
215215

216-
# - uses: actions/cache@v4
217-
# if: matrix.benchmark == false
218-
# with:
219-
# key: v2-deps-${{ runner.os }}-${{ hashFiles( 'build.py' ) }}
220-
# restore-keys: |
221-
# v2-deps-${{ runner.os }}-
222-
# v1-deps-${{ runner.os }}-
223-
# path: |
224-
# third-party/clangd/cache
225-
# third_party/eclipse.jdt.ls/target/cache
226-
# third_party/go
227-
# third_party/omnisharp-roslyn/v[0-9]*
228-
# name: Cache dependencies
216+
- uses: actions/cache@v4
217+
if: matrix.benchmark == false
218+
with:
219+
key: v2-deps-${{ runner.os }}-${{ hashFiles( 'build.py' ) }}
220+
restore-keys: |
221+
v2-deps-${{ runner.os }}-
222+
v1-deps-${{ runner.os }}-
223+
path: |
224+
third-party/clangd/cache
225+
third_party/eclipse.jdt.ls/target/cache
226+
third_party/go
227+
third_party/omnisharp-roslyn/v[0-9]*
228+
name: Cache dependencies
229229

230-
# - uses: actions/cache@v4
231-
# if: matrix.benchmark == false
232-
# with:
233-
# key: v2-testdeps-${{ runner.os }}-${{ hashFiles( 'run_tests.py' ) }}
234-
# restore-keys: |
235-
# v2-testdeps-${{ runner.os }}-
236-
# v1-testdeps-${{ runner.os }}-
237-
# path: |
238-
# third-party/lombok/cache
239-
# ~/.npm
240-
# name: Cache test deps
230+
- uses: actions/cache@v4
231+
if: matrix.benchmark == false
232+
with:
233+
key: v2-testdeps-${{ runner.os }}-${{ hashFiles( 'run_tests.py' ) }}
234+
restore-keys: |
235+
v2-testdeps-${{ runner.os }}-
236+
v1-testdeps-${{ runner.os }}-
237+
path: |
238+
third-party/lombok/cache
239+
~/.npm
240+
name: Cache test deps
241241

242-
# - name: Install Java
243-
# if: matrix.benchmark == false
244-
# uses: actions/setup-java@v4
245-
# with:
246-
# java-version: 17
247-
# distribution: 'temurin'
248-
# - name: Install Python
249-
# uses: actions/setup-python@v5
250-
# with:
251-
# python-version: '3.9'
252-
# architecture: ${{ matrix.python-arch }}
253-
# - name: Install Go
254-
# if: matrix.benchmark == false
255-
# uses: actions/setup-go@v5
256-
# with:
257-
# go-version: stable
258-
# cache: false
259-
# - name: Run pip and prepare coverage
260-
# if: matrix.benchmark == false
261-
# run: |
262-
# python3 -m pip install -r test_requirements.txt
263-
# echo -e "import coverage\ncoverage.process_startup()" > $(python -c "print(__import__('sysconfig').get_path('purelib'))")/sitecustomize.py
264-
# shell: bash
265-
# - name: Run benchmarks
266-
# if: matrix.benchmark == true
267-
# run: python3 benchmark.py --msvc ${{ matrix.msvc }} --quiet
268-
# - name: Run tests
269-
# if: matrix.benchmark == false
270-
# run: python3 run_tests.py --msvc ${{ matrix.msvc }} --quiet
271-
# - name: Combine and summarise coverage
272-
# if: matrix.benchmark == false
273-
# run: coverage combine && coverage xml
274-
# - name: Upload coverage data
275-
# uses: codecov/codecov-action@v4
276-
# if: matrix.benchmark == false
277-
# with:
278-
# name: "${{ matrix.runs-on }}-${{ matrix.name_suffix }}-tests"
279-
# token: ${{ secrets.CODECOV_TOKEN }}
242+
- name: Install Java
243+
if: matrix.benchmark == false
244+
uses: actions/setup-java@v4
245+
with:
246+
java-version: 17
247+
distribution: 'temurin'
248+
- name: Install Python
249+
uses: actions/setup-python@v5
250+
with:
251+
python-version: '3.9'
252+
architecture: ${{ matrix.python-arch }}
253+
- name: Install Go
254+
if: matrix.benchmark == false
255+
uses: actions/setup-go@v5
256+
with:
257+
go-version: stable
258+
cache: false
259+
- name: Run pip and prepare coverage
260+
if: matrix.benchmark == false
261+
run: |
262+
python3 -m pip install -r test_requirements.txt
263+
echo -e "import coverage\ncoverage.process_startup()" > $(python -c "print(__import__('sysconfig').get_path('purelib'))")/sitecustomize.py
264+
shell: bash
265+
- name: Run benchmarks
266+
if: matrix.benchmark == true
267+
run: python3 benchmark.py --msvc ${{ matrix.msvc }} --quiet
268+
- name: Run tests
269+
if: matrix.benchmark == false
270+
run: python3 run_tests.py --msvc ${{ matrix.msvc }} --quiet
271+
- name: Combine and summarise coverage
272+
if: matrix.benchmark == false
273+
run: coverage combine && coverage xml
274+
- name: Upload coverage data
275+
uses: codecov/codecov-action@v4
276+
if: matrix.benchmark == false
277+
with:
278+
name: "${{ matrix.runs-on }}-${{ matrix.name_suffix }}-tests"
279+
token: ${{ secrets.CODECOV_TOKEN }}

third_party/jedi_deps/numpydoc

Submodule numpydoc updated 58 files

0 commit comments

Comments
 (0)