diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 36edbad..ece2f34 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,6 @@ jobs: release: uses: autumn-library/workflows/.github/workflows/release.yml@main with: - oscript_version: '1.8.3' package_mask: "gitrunner-*.ospx" secrets: PUSH_TOKEN: ${{ secrets.PUSH_TOKEN }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9389b70..e44173f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - oscript_version: ['1.8.3', 'stable'] + oscript_version: ['default', 'stable'] uses: autumn-library/workflows/.github/workflows/test.yml@main with: oscript_version: ${{ matrix.oscript_version }} diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 6fcfea7..aba78cd 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,27 +1,39 @@ { - "version": "0.1.0", + "version": "2.0.0", "command": "oscript", - "isShellCommand": true, - "showOutput": "silent", + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared", + "showReuseMessage": true, + "clear": false + }, "args": [ "-encoding=utf-8" ], "tasks": [ { - "taskName": "Exec all features", + "type": "shell", + "label": "Exec all features", + "command":[ + "1bdd" + ], "args": [ - "|", - "1bdd", "${workspaceRoot}/features", "-fail-fast", "-out", "${workspaceRoot}/exec.log" ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isBuildCommand": true, - "isTestCommand": false, + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared", + "showReuseMessage": true, + "clear": false + }, + "group": "test", "problemMatcher": { "fileLocation": "absolute", "pattern": { @@ -33,19 +45,26 @@ } }, { - "taskName": "Exec feature", + "type": "shell", + "label": "Exec feature", + "command":[ + "1bdd" + ], "args": [ - "|", - "1bdd", "${file}", "-fail-fast", "-out", "${workspaceRoot}/exec.log" ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isTestCommand": true, + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared", + "showReuseMessage": true, + "clear": false + }, + "group": "test", "problemMatcher": { "fileLocation": "absolute", "pattern": [ @@ -59,10 +78,13 @@ } }, { - "taskName": "Exec feature + debug", + "type": "shell", + "label": "Exec feature + debug", + "command":[ + "1bdd" + + ], "args": [ - "|", - "1bdd", "${file}", "-fail-fast", "-verbose", @@ -70,10 +92,15 @@ "-out", "${workspaceRoot}/exec.log" ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isTestCommand": false, + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared", + "showReuseMessage": true, + "clear": false + }, + "group": "test", "problemMatcher": { "fileLocation": "absolute", "pattern": { @@ -85,10 +112,12 @@ } }, { - "taskName": "Generate feature steps", + "type": "shell", + "label": "Generate feature steps", + "command":[ + "1bdd" + ], "args": [ - "|", - "1bdd", "gen", "${file}", // "-verbose", @@ -96,10 +125,15 @@ "-out", "${workspaceRoot}/exec.log" ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isTestCommand": false, + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared", + "showReuseMessage": true, + "clear": false + }, + "group": "build", "problemMatcher": { "fileLocation": "absolute", "pattern": { @@ -111,10 +145,12 @@ } }, { - "taskName": "Generate feature steps + debug", + "type": "shell", + "label": "Generate feature steps + debug", + "command":[ + "1bdd" + ], "args": [ - "|", - "1bdd", "gen", "${file}", "-verbose", @@ -122,10 +158,15 @@ "-out", "${workspaceRoot}/gen.log" ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isTestCommand": false, + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared", + "showReuseMessage": true, + "clear": false + }, + "group": "build", "problemMatcher": { "fileLocation": "absolute", "pattern": { @@ -137,48 +178,84 @@ } }, { - "taskName": "OneScript: compile", + "type": "shell", + "label": "OneScript: compile", + "command":[ + "oscript" + ], "args": [ "-compile", "${file}" ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isBuildCommand": false + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared", + "showReuseMessage": true, + "clear": false + }, + "group": "test", }, { - "taskName": "OneScript: check", + "type": "shell", + "label": "OneScript: check", + "command":[ + "oscript" + ], "args": [ "-check", "${file}" ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isBuildCommand": false + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared", + "showReuseMessage": true, + "clear": false + }, + "group": "test", }, { - "taskName": "OneScript: make", + "type": "shell", + "label": "OneScript: make", + "command":[ + "oscript" + ], "args": [ "-make", "${file}", "${fileBasename}.exe" ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isBuildCommand": false + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared", + "showReuseMessage": true, + "clear": false + }, + "group": "test", }, { - "taskName": "OneScript: run", + "type": "shell", + "label": "OneScript: run", + "command":[ + "oscript" + ], "args": [ "${file}" ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isBuildCommand": true, + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared", + "showReuseMessage": true, + "clear": false + }, + "group": "build", "problemMatcher": { "fileLocation": "absolute", "pattern": { diff --git "a/features/step_definitions/\320\240\320\260\320\261\320\276\321\202\320\260\320\241\320\222\320\275\320\265\321\210\320\275\320\270\320\274\320\270\320\240\320\265\320\277\320\276\320\267\320\270\321\202\320\276\321\200\320\270\321\217\320\274\320\270.os" "b/features/step_definitions/\320\240\320\260\320\261\320\276\321\202\320\260\320\241\320\222\320\275\320\265\321\210\320\275\320\270\320\274\320\270\320\240\320\265\320\277\320\276\320\267\320\270\321\202\320\276\321\200\320\270\321\217\320\274\320\270.os" index c16b59d..8c67b34 100644 --- "a/features/step_definitions/\320\240\320\260\320\261\320\276\321\202\320\260\320\241\320\222\320\275\320\265\321\210\320\275\320\270\320\274\320\270\320\240\320\265\320\277\320\276\320\267\320\270\321\202\320\276\321\200\320\270\321\217\320\274\320\270.os" +++ "b/features/step_definitions/\320\240\320\260\320\261\320\276\321\202\320\260\320\241\320\222\320\275\320\265\321\210\320\275\320\270\320\274\320\270\320\240\320\265\320\277\320\276\320\267\320\270\321\202\320\276\321\200\320\270\321\217\320\274\320\270.os" @@ -1,4 +1,7 @@ -// Реализация шагов BDD-фич/сценариев c помощью фреймворка https://github.com/artbear/1bdd +// BSLLS:MissingReturnedValueDescription-off +// BSLLS:MissingParameterDescription-off + +// Реализация шагов BDD-фич/сценариев c помощью фреймворка https://github.com/artbear/1bdd #Использовать asserts diff --git "a/features/step_definitions/\320\240\320\260\320\261\320\276\321\202\320\260\320\241\320\237\320\276\320\264\320\274\320\276\320\264\321\203\320\273\321\217\320\274\320\270.os" "b/features/step_definitions/\320\240\320\260\320\261\320\276\321\202\320\260\320\241\320\237\320\276\320\264\320\274\320\276\320\264\321\203\320\273\321\217\320\274\320\270.os" index 7c40248..a8eb03f 100644 --- "a/features/step_definitions/\320\240\320\260\320\261\320\276\321\202\320\260\320\241\320\237\320\276\320\264\320\274\320\276\320\264\321\203\320\273\321\217\320\274\320\270.os" +++ "b/features/step_definitions/\320\240\320\260\320\261\320\276\321\202\320\260\320\241\320\237\320\276\320\264\320\274\320\276\320\264\321\203\320\273\321\217\320\274\320\270.os" @@ -1,4 +1,6 @@ -// Реализация шагов BDD-фич/сценариев c помощью фреймворка https://github.com/artbear/1bdd +// BSLLS:MissingParameterDescription-off + +// Реализация шагов BDD-фич/сценариев c помощью фреймворка https://github.com/artbear/1bdd #Использовать asserts diff --git "a/features/\320\240\320\260\320\261\320\276\321\202\320\260\320\241\320\237\320\276\320\264\320\274\320\276\320\264\321\203\320\273\321\217\320\274\320\270.feature" "b/features/\320\240\320\260\320\261\320\276\321\202\320\260\320\241\320\237\320\276\320\264\320\274\320\276\320\264\321\203\320\273\321\217\320\274\320\270.feature" index 1f32c25..2526de3 100644 --- "a/features/\320\240\320\260\320\261\320\276\321\202\320\260\320\241\320\237\320\276\320\264\320\274\320\276\320\264\321\203\320\273\321\217\320\274\320\270.feature" +++ "b/features/\320\240\320\260\320\261\320\276\321\202\320\260\320\241\320\237\320\276\320\264\320\274\320\276\320\264\321\203\320\273\321\217\320\274\320\270.feature" @@ -12,7 +12,7 @@ И Я инициализирую репозиторий во временном каталоге Сценарий: Добавление подмодуля - Когда Я добавляю подмодуль "https://github.com/nixel2007/gitrunner" с веткой "develop" + Когда Я добавляю подмодуль "https://github.com/nixel2007/gitrunner" с веткой "gitrunner-submodule-test" И Я обновляю подмодули И Я получаю состояние подмодулей - Тогда Список подмодулей содержит подмодуль "gitrunner" c указателем "heads/develop" + Тогда Список подмодулей содержит подмодуль "gitrunner" c указателем "v1.7.0-20-g674ffa7" diff --git a/packagedef b/packagedef index a706e0a..7fc241d 100644 --- a/packagedef +++ b/packagedef @@ -1,13 +1,12 @@ Описание.Имя("gitrunner") - .Версия("1.7.1") - .ЗависитОт("1bdd") - .ВерсияСреды("1.7.0") - .ЗависитОт("1commands", "1.3.1") + .Версия("1.8.0") + .ВерсияСреды("1.9.2") + .ЗависитОт("1commands", "1.5.0") .ЗависитОт("asserts", "0.4.0") .ЗависитОт("fs", "0.4.1") .ЗависитОт("json", "1.0.1") - .ЗависитОт("logos", "1.0.0") - .РазработкаЗависитОт("1bdd", "1.13.0") + .ЗависитОт("logos", "1.7.1") + .РазработкаЗависитОт("1bdd", "1.15.1") .Задачи("tasks") .ВключитьФайл("src") .ВключитьФайл("features") diff --git "a/src/\320\223\320\270\321\202\320\240\320\265\320\277\320\276\320\267\320\270\321\202\320\276\321\200\320\270\320\271.os" "b/src/\320\223\320\270\321\202\320\240\320\265\320\277\320\276\320\267\320\270\321\202\320\276\321\200\320\270\320\271.os" index fc62147..a4b94a0 100644 --- "a/src/\320\223\320\270\321\202\320\240\320\265\320\277\320\276\320\267\320\270\321\202\320\276\321\200\320\270\320\271.os" +++ "b/src/\320\223\320\270\321\202\320\240\320\265\320\277\320\276\320\267\320\270\321\202\320\276\321\200\320\270\320\271.os" @@ -158,7 +158,10 @@ Если НадоОчиститьУстановленныеПеременные Тогда ОчиститьУстановленныеПеременныеГит(); КонецЕсли; - ВосстановитьКоммитера(); + + Если Не ПустаяСтрока(Коммитер) Тогда + ВосстановитьКоммитера(); + КонецЕсли; Если НадоУдалитьВременныйФайлКомментария Тогда Попытка