Skip to content

Commit f4801a5

Browse files
committed
ci: fix some settings and coverage
1 parent 6f54f7f commit f4801a5

File tree

3 files changed

+55
-10
lines changed

3 files changed

+55
-10
lines changed

.github/workflows/buildtest.yml

Lines changed: 39 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ jobs:
6262
echo "${VIRTUAL_ENV}/lib" >> $GITHUB_PATH
6363
echo "${VIRTUAL_ENV}/lib64" >> $GITHUB_PATH
6464
echo "LD_LIBRARY_PATH=${VIRTUAL_ENV}/lib:${VIRTUAL_ENV}/lib64:$LD_LIBRARY_PATH" >> $GITHUB_ENV
65-
echo "PYTHON_PATH=${VIRTUAL_ENV}/bin" >> "$GITHUB_OUTPUT"
66-
echo "RETICULATE_PYTHON=${VIRTUAL_ENV}/bin/python3" >> "$GITHUB_OUTPUT"
67-
echo "PYTHON_VERSION=$(python --version)" >> "$GITHUB_OUTPUT"
6865
- name: Setup pip
6966
run: |
7067
pip3 install -U pip
@@ -82,6 +79,9 @@ jobs:
8279
- name: Setup cached item
8380
run: |
8481
pip3 install -r requirements.txt
82+
echo '::group:: pip list'
83+
pip3 list
84+
echo '::endgroup::'
8585
- name: Setup Vim
8686
id: 'vim'
8787
uses: thinca/action-setup-vim@v2
@@ -118,13 +118,21 @@ jobs:
118118
env:
119119
THEMIS_PROFILE: ${{ github.workspace }}/vim-profile-${{ runner.os }}-${{ matrix.vim }}-${{ matrix.type }}.txt
120120
run: |
121-
export PATH=$(python3 -m site --user-base)/bin:${PATH}
121+
echo '::group:: Profile file: ${THEMIS_PROFILE}'
122+
cat "${THEMIS_PROFILE}"
123+
echo '::endgroup::'
122124
covimerage write_coverage "${THEMIS_PROFILE}"
125+
echo '::group:: coverage file: .coverage_covimerage'
126+
cat .coverage_covimerage
127+
echo '::endgroup::'
123128
coverage xml
129+
echo '::group:: xml file: coverage.xml'
130+
cat coverage.xml
131+
echo '::endgroup::'
124132
- name: Send coverage
125133
uses: codecov/codecov-action@v5
126134
with:
127-
file: ./coverage.xml
135+
files: ./coverage.xml
128136
env_vars: OS,VIMVER
129137
windows:
130138
strategy:
@@ -180,6 +188,16 @@ jobs:
180188
[Reflection.Assembly]::LoadWithPartialName('System.IO.Compression.FileSystem') > $null
181189
[System.IO.Compression.ZipFile]::ExtractToDirectory($zip, $lua)
182190
Write-Output "$($lua)" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
191+
- name: Setup Python
192+
uses: actions/setup-python@v5
193+
with:
194+
python-version-file: '.python-version'
195+
- name: Setup venv
196+
run: |
197+
python -m venv .venv
198+
.venv\Scripts\activate
199+
echo "VIRTUAL_ENV=%VIRTUAL_ENV%" >> %GITHUB_ENV%
200+
echo "%VIRTUAL_ENV%\Scripts" >> %GITHUB_PATH%
183201
- name: Setup pip
184202
id: setup
185203
run: |
@@ -195,6 +213,12 @@ jobs:
195213
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
196214
restore-keys: |
197215
${{ runner.os }}-pip-
216+
- name: Setup cached item
217+
run: |
218+
pip install -r requirements.txt
219+
echo '::group:: pip list'
220+
pip list
221+
echo '::endgroup::'
198222
- name: Setup Vim
199223
id: 'vim'
200224
uses: thinca/action-setup-vim@v2
@@ -234,11 +258,19 @@ jobs:
234258
THEMIS_PROFILE: ${{ github.workspace }}/vim-profile-${{ runner.os }}-${{ matrix.vim }}-${{ matrix.type }}.txt
235259
shell: pwsh
236260
run: |
237-
pip install -r requirements.txt
261+
echo '::group:: Profile file: ${Env:THEMIS_PROFILE}'
262+
cat "${Env:THEMIS_PROFILE}"
263+
echo '::endgroup::'
238264
covimerage write_coverage ${Env:THEMIS_PROFILE}
265+
echo '::group:: coverage file: .coverage_covimerage'
266+
cat .coverage_covimerage
267+
echo '::endgroup::'
239268
coverage xml
269+
echo '::group:: xml file: coverage.xml'
270+
cat coverage.xml
271+
echo '::endgroup::'
240272
- name: Send coverage
241273
uses: codecov/codecov-action@v5
242274
with:
243-
file: ./coverage.xml
275+
files: ./coverage.xml
244276
env_vars: OS,VIMVER

requirements.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
coverage==4.5.4
2+
covimerage

requirements.txt

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
1-
###### Requirements without Version Specifiers ######
21
#
3-
covimerage
4-
###### Requirements with Version Specifiers ######
2+
# This file is autogenerated by pip-compile with Python 3.13
3+
# by the following command:
54
#
5+
# pip-compile
6+
#
7+
attrs==25.1.0
8+
# via covimerage
9+
click==7.0
10+
# via covimerage
11+
coverage==4.5.4
12+
# via
13+
# -r requirements.in
14+
# covimerage
15+
covimerage==0.2.2
16+
# via -r requirements.in

0 commit comments

Comments
 (0)