Skip to content

Commit 8d60973

Browse files
authored
Merge pull request sfaqer#6 from sfaqer/bugfix/coverage_ga
Исправлена ошибка генерации отчёта покрытия
2 parents 287e67b + 9fb6762 commit 8d60973

File tree

3 files changed

+8
-36
lines changed

3 files changed

+8
-36
lines changed

.github/workflows/testing.yml

Lines changed: 6 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,46 +2,17 @@ name: Тестирование
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ 'master' ]
66
pull_request:
77
workflow_dispatch:
88

99
jobs:
10-
build:
11-
runs-on: ${{ matrix.os }}
10+
test:
1211
strategy:
1312
fail-fast: false
1413
matrix:
15-
os: ['ubuntu-latest', 'windows-latest', 'macos-latest']
1614
oscript_version: ['default', 'dev']
17-
18-
steps:
19-
- name: Актуализация
20-
uses: actions/[email protected]
21-
- name: Вычисление версии OneScript
22-
shell: bash
23-
id: extract_oscript_version
24-
run: |
25-
set -ex
26-
if [ "${{ matrix.oscript_version }}" = "default" ]
27-
then
28-
extracted_version=$(cat packagedef | grep ".ВерсияСреды(" | sed 's|[^"]*"||' | sed -r 's/".+//' || true)
29-
version="${extracted_version:-stable}"
30-
else
31-
version="${{ matrix.oscript_version }}"
32-
fi
33-
echo "version=$version" >> $GITHUB_OUTPUT
34-
35-
- name: Установка OneScript
36-
uses: otymko/[email protected]
37-
with:
38-
version: ${{ steps.extract_oscript_version.outputs.version }}
39-
40-
- name: Установка зависимостей
41-
run: |
42-
opm install opm
43-
opm install -l --dev
44-
45-
- name: Тестирование
46-
run: |
47-
oscript ${{ runner.os == 'Windows' && 'src\\cli\\main.os' || 'src/cli/main.os' }} e
15+
uses: autumn-library/workflows/.github/workflows/test.yml@main
16+
with:
17+
oscript_version: ${{ matrix.oscript_version }}
18+
test_script_path: './src/cli/main.os e'

src/cli/internal/isolated/Классы/ОписаниеКонсольногоПриложения.os

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
КонецФункции
1313

1414
Функция ВерсияПриложения() Экспорт
15-
Возврат "0.2.3";
15+
Возврат "0.2.4";
1616
КонецФункции

src/cli/Классы/КомандаТестировать.os

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@
151151

152152
ПроцессорГенерации.ФайлСтатистики(ПутьКСтатистике)
153153
.РабочийКаталог(ВременныйКаталог)
154+
.ИмяФайлаСтатистики("*")
154155
.GenericCoverage("genericCoverage.xml")
155156
.Cobertura("cobertura.xml")
156157
.Сформировать();

0 commit comments

Comments
 (0)