Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ jobs:
uses: autumn-library/workflows/.github/workflows/release.yml@main
with:
package_mask: "oneunit-*.ospx"
oscript_version: "2.0.0.rc6"
oscript_version: "2.0.0-rc.7"
secrets:
PUSH_TOKEN: ${{ secrets.PUSH_TOKEN }}
47 changes: 47 additions & 0 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Тестирование

on:
push:
branches: [ master ]
pull_request:
workflow_dispatch:

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: ['ubuntu-latest', 'windows-latest', 'macos-latest']
oscript_version: ['default', 'dev']

steps:
- name: Актуализация
uses: actions/[email protected]
- name: Вычисление версии OneScript
shell: bash
id: extract_oscript_version
run: |
set -ex
if [ "${{ matrix.oscript_version }}" = "default" ]
then
extracted_version=$(cat packagedef | grep ".ВерсияСреды(" | sed 's|[^"]*"||' | sed -r 's/".+//' || true)
version="${extracted_version:-stable}"
else
version="${{ matrix.oscript_version }}"
fi
echo "version=$version" >> $GITHUB_OUTPUT

- name: Установка OneScript
uses: otymko/[email protected]
with:
version: ${{ steps.extract_oscript_version.outputs.version }}

- name: Установка зависимостей
run: |
opm install opm
opm install -l --dev

- name: Тестирование
run: |
oscript ${{ runner.os == 'Windows' && 'src\\cli\\main.os' || 'src/cli/main.os' }} e
10 changes: 5 additions & 5 deletions packagedef
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@
.ВключитьФайл("README.md")

.ЗависитОт("1commands", "1.5.0")
.ЗависитОт("annotations", "1.3.0")
.ЗависитОт("annotations", "1.3.1")
.ЗависитОт("asserts", "1.4.0")
.ЗависитОт("async", "0.3.0")
.ЗависитОт("autumn", "4.3.9")
.ЗависитОт("autumn-cli", "1.1.0")
.ЗависитОт("autumn", "4.3.10")
.ЗависитОт("autumn-cli", "1.2.0")
.ЗависитОт("autumn-event-publisher", "1.0.1")
.ЗависитОт("autumn-logos", "1.2.0")
.ЗависитОт("collectionos", "0.7.2")
.ЗависитОт("collectionos", "0.8.2")
.ЗависитОт("coverage", "0.7.0")
.ЗависитОт("decorator", "2.0.3")
.ЗависитОт("fs", "1.2.0")
.ЗависитОт("lambdas", "0.3.2")
.ЗависитОт("logos", "1.7.1")
.ЗависитОт("semver", "0.5.2")
.ЗависитОт("semver", "1.0.0")
.ЗависитОт("tempfiles", "1.1.1")

.ИсполняемыйФайл("src/cli/main.os")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
КонецФункции

Функция ВерсияПриложения() Экспорт
Возврат "0.2.2";
Возврат "0.2.3";
КонецФункции
1 change: 1 addition & 0 deletions src/cli/main.os
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#Использовать "."
#Использовать "./internal/isolated"
#Использовать "../shared"

СоветДругогоМастера = Новый СоветДругогоМастера()
.ЗначенияДеталек(Новый Соответствие(
Expand Down
1 change: 1 addition & 0 deletions src/cli/Классы/КомандаОбнаружить.os
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#Использовать tempfiles
#Использовать collectionos
#Использовать "../internal"
#Использовать "../../shared"

&ОпцияКаталогиТестов
Перем КаталогиТестов;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#Использовать annotations
#Использовать collectionos
#Использовать "../../../shared"

Перем _Поделка;
Перем _Фильтры;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#Использовать "../../../shared"

Перем _Результат;
Перем _Причины;
Перем _Вывод;
Expand Down
1 change: 1 addition & 0 deletions src/core/internal/Классы/РепортерJUnit.os
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#Использовать collectionos
#Использовать "../../../shared"

Перем _ПутьКОтчету;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#Использовать collectionos
#Использовать "../../../shared"

Перем _ПутьКОтчету;
Перем _РепортерСтатистика;
Expand Down
2 changes: 1 addition & 1 deletion tests/oscript.cfg
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lib.system=../oscript_modules
lib.additional=../oscript_modules
Loading