From 2f89798cf6d59cec6f6b6449bc95aace7c10a2a1 Mon Sep 17 00:00:00 2001 From: Dima Ovcharenko Date: Fri, 23 May 2025 19:25:43 +0300 Subject: [PATCH 01/11] fix "fatal: no such section: bak.user" --- ...0\267\320\270\321\202\320\276\321\200\320\270\320\271.os" | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 @@ Если НадоОчиститьУстановленныеПеременные Тогда ОчиститьУстановленныеПеременныеГит(); КонецЕсли; - ВосстановитьКоммитера(); + + Если Не ПустаяСтрока(Коммитер) Тогда + ВосстановитьКоммитера(); + КонецЕсли; Если НадоУдалитьВременныйФайлКомментария Тогда Попытка From 484c8a30bde89f7dbca5d600ce2811009fd6b578 Mon Sep 17 00:00:00 2001 From: Dima Ovcharenko Date: Fri, 23 May 2025 20:47:10 +0300 Subject: [PATCH 02/11] bump oscript --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9389b70..bde3dcc 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: ['1.9.2', 'stable'] uses: autumn-library/workflows/.github/workflows/test.yml@main with: oscript_version: ${{ matrix.oscript_version }} From 100ea4ed93a0ea4583dab75d095d355b533cbdcf Mon Sep 17 00:00:00 2001 From: Dima Ovcharenko Date: Fri, 23 May 2025 20:50:42 +0300 Subject: [PATCH 03/11] bump logos --- .vscode/tasks.json | 189 +--------------------------------------- .vscode/tasks.json.old | 193 +++++++++++++++++++++++++++++++++++++++++ packagedef | 2 +- 3 files changed, 196 insertions(+), 188 deletions(-) create mode 100644 .vscode/tasks.json.old diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 6fcfea7..0eafac7 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,193 +1,8 @@ { - "version": "0.1.0", + "version": "2.0.0", "command": "oscript", - "isShellCommand": true, - "showOutput": "silent", "args": [ "-encoding=utf-8" ], - "tasks": [ - { - "taskName": "Exec all features", - "args": [ - "|", - "1bdd", - "${workspaceRoot}/features", - "-fail-fast", - "-out", - "${workspaceRoot}/exec.log" - ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isBuildCommand": true, - "isTestCommand": false, - "problemMatcher": { - "fileLocation": "absolute", - "pattern": { - "regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)", - "file": 1, - "location": 2, - "message": 3 - } - } - }, - { - "taskName": "Exec feature", - "args": [ - "|", - "1bdd", - "${file}", - "-fail-fast", - "-out", - "${workspaceRoot}/exec.log" - ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isTestCommand": true, - "problemMatcher": { - "fileLocation": "absolute", - "pattern": [ - { - "regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)", - "file": 1, - "location": 2, - "message": 3 - } - ] - } - }, - { - "taskName": "Exec feature + debug", - "args": [ - "|", - "1bdd", - "${file}", - "-fail-fast", - "-verbose", - "on", - "-out", - "${workspaceRoot}/exec.log" - ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isTestCommand": false, - "problemMatcher": { - "fileLocation": "absolute", - "pattern": { - "regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)", - "file": 1, - "location": 2, - "message": 3 - } - } - }, - { - "taskName": "Generate feature steps", - "args": [ - "|", - "1bdd", - "gen", - "${file}", - // "-verbose", - // "on", - "-out", - "${workspaceRoot}/exec.log" - ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isTestCommand": false, - "problemMatcher": { - "fileLocation": "absolute", - "pattern": { - "regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)", - "file": 1, - "location": 2, - "message": 3 - } - } - }, - { - "taskName": "Generate feature steps + debug", - "args": [ - "|", - "1bdd", - "gen", - "${file}", - "-verbose", - "on", - "-out", - "${workspaceRoot}/gen.log" - ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isTestCommand": false, - "problemMatcher": { - "fileLocation": "absolute", - "pattern": { - "regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)", - "file": 1, - "location": 2, - "message": 3 - } - } - }, - { - "taskName": "OneScript: compile", - "args": [ - "-compile", - "${file}" - ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isBuildCommand": false - }, - { - "taskName": "OneScript: check", - "args": [ - "-check", - "${file}" - ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isBuildCommand": false - }, - { - "taskName": "OneScript: make", - "args": [ - "-make", - "${file}", - "${fileBasename}.exe" - ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isBuildCommand": false - }, - { - "taskName": "OneScript: run", - "args": [ - "${file}" - ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isBuildCommand": true, - "problemMatcher": { - "fileLocation": "absolute", - "pattern": { - "regexp": "^{Модуль\\s+(.*)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+(.*)}$", - "file": 1, - "location": 2, - "message": 3 - } - } - } - ] + "tasks": [] } \ No newline at end of file diff --git a/.vscode/tasks.json.old b/.vscode/tasks.json.old new file mode 100644 index 0000000..6fcfea7 --- /dev/null +++ b/.vscode/tasks.json.old @@ -0,0 +1,193 @@ +{ + "version": "0.1.0", + "command": "oscript", + "isShellCommand": true, + "showOutput": "silent", + "args": [ + "-encoding=utf-8" + ], + "tasks": [ + { + "taskName": "Exec all features", + "args": [ + "|", + "1bdd", + "${workspaceRoot}/features", + "-fail-fast", + "-out", + "${workspaceRoot}/exec.log" + ], + "echoCommand": true, + "showOutput": "always", + "suppressTaskName": true, + "isBuildCommand": true, + "isTestCommand": false, + "problemMatcher": { + "fileLocation": "absolute", + "pattern": { + "regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)", + "file": 1, + "location": 2, + "message": 3 + } + } + }, + { + "taskName": "Exec feature", + "args": [ + "|", + "1bdd", + "${file}", + "-fail-fast", + "-out", + "${workspaceRoot}/exec.log" + ], + "echoCommand": true, + "showOutput": "always", + "suppressTaskName": true, + "isTestCommand": true, + "problemMatcher": { + "fileLocation": "absolute", + "pattern": [ + { + "regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)", + "file": 1, + "location": 2, + "message": 3 + } + ] + } + }, + { + "taskName": "Exec feature + debug", + "args": [ + "|", + "1bdd", + "${file}", + "-fail-fast", + "-verbose", + "on", + "-out", + "${workspaceRoot}/exec.log" + ], + "echoCommand": true, + "showOutput": "always", + "suppressTaskName": true, + "isTestCommand": false, + "problemMatcher": { + "fileLocation": "absolute", + "pattern": { + "regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)", + "file": 1, + "location": 2, + "message": 3 + } + } + }, + { + "taskName": "Generate feature steps", + "args": [ + "|", + "1bdd", + "gen", + "${file}", + // "-verbose", + // "on", + "-out", + "${workspaceRoot}/exec.log" + ], + "echoCommand": true, + "showOutput": "always", + "suppressTaskName": true, + "isTestCommand": false, + "problemMatcher": { + "fileLocation": "absolute", + "pattern": { + "regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)", + "file": 1, + "location": 2, + "message": 3 + } + } + }, + { + "taskName": "Generate feature steps + debug", + "args": [ + "|", + "1bdd", + "gen", + "${file}", + "-verbose", + "on", + "-out", + "${workspaceRoot}/gen.log" + ], + "echoCommand": true, + "showOutput": "always", + "suppressTaskName": true, + "isTestCommand": false, + "problemMatcher": { + "fileLocation": "absolute", + "pattern": { + "regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)", + "file": 1, + "location": 2, + "message": 3 + } + } + }, + { + "taskName": "OneScript: compile", + "args": [ + "-compile", + "${file}" + ], + "echoCommand": true, + "showOutput": "always", + "suppressTaskName": true, + "isBuildCommand": false + }, + { + "taskName": "OneScript: check", + "args": [ + "-check", + "${file}" + ], + "echoCommand": true, + "showOutput": "always", + "suppressTaskName": true, + "isBuildCommand": false + }, + { + "taskName": "OneScript: make", + "args": [ + "-make", + "${file}", + "${fileBasename}.exe" + ], + "echoCommand": true, + "showOutput": "always", + "suppressTaskName": true, + "isBuildCommand": false + }, + { + "taskName": "OneScript: run", + "args": [ + "${file}" + ], + "echoCommand": true, + "showOutput": "always", + "suppressTaskName": true, + "isBuildCommand": true, + "problemMatcher": { + "fileLocation": "absolute", + "pattern": { + "regexp": "^{Модуль\\s+(.*)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+(.*)}$", + "file": 1, + "location": 2, + "message": 3 + } + } + } + ] +} \ No newline at end of file diff --git a/packagedef b/packagedef index a706e0a..9537c84 100644 --- a/packagedef +++ b/packagedef @@ -6,7 +6,7 @@ .ЗависитОт("asserts", "0.4.0") .ЗависитОт("fs", "0.4.1") .ЗависитОт("json", "1.0.1") - .ЗависитОт("logos", "1.0.0") + .ЗависитОт("logos", "1.7.0") .РазработкаЗависитОт("1bdd", "1.13.0") .Задачи("tasks") .ВключитьФайл("src") From b091d9dcb11c273f7b022e9cc00a2ada236bb587 Mon Sep 17 00:00:00 2001 From: Dima Ovcharenko Date: Fri, 23 May 2025 20:55:36 +0300 Subject: [PATCH 04/11] bump 1bdd --- packagedef | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packagedef b/packagedef index 9537c84..22732a2 100644 --- a/packagedef +++ b/packagedef @@ -7,7 +7,7 @@ .ЗависитОт("fs", "0.4.1") .ЗависитОт("json", "1.0.1") .ЗависитОт("logos", "1.7.0") - .РазработкаЗависитОт("1bdd", "1.13.0") + .РазработкаЗависитОт("1bdd", "1.15.1") .Задачи("tasks") .ВключитьФайл("src") .ВключитьФайл("features") From c9e160dc4eaa2c28bbb34ccb09bc7c8b4d390f48 Mon Sep 17 00:00:00 2001 From: Dima Date: Sat, 24 May 2025 12:58:25 +0300 Subject: [PATCH 05/11] revert .vscode --- .vscode/tasks.json | 189 +++++++++++++++++++++++++++++++++++++++- .vscode/tasks.json.old | 193 ----------------------------------------- 2 files changed, 187 insertions(+), 195 deletions(-) delete mode 100644 .vscode/tasks.json.old diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 0eafac7..6fcfea7 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,8 +1,193 @@ { - "version": "2.0.0", + "version": "0.1.0", "command": "oscript", + "isShellCommand": true, + "showOutput": "silent", "args": [ "-encoding=utf-8" ], - "tasks": [] + "tasks": [ + { + "taskName": "Exec all features", + "args": [ + "|", + "1bdd", + "${workspaceRoot}/features", + "-fail-fast", + "-out", + "${workspaceRoot}/exec.log" + ], + "echoCommand": true, + "showOutput": "always", + "suppressTaskName": true, + "isBuildCommand": true, + "isTestCommand": false, + "problemMatcher": { + "fileLocation": "absolute", + "pattern": { + "regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)", + "file": 1, + "location": 2, + "message": 3 + } + } + }, + { + "taskName": "Exec feature", + "args": [ + "|", + "1bdd", + "${file}", + "-fail-fast", + "-out", + "${workspaceRoot}/exec.log" + ], + "echoCommand": true, + "showOutput": "always", + "suppressTaskName": true, + "isTestCommand": true, + "problemMatcher": { + "fileLocation": "absolute", + "pattern": [ + { + "regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)", + "file": 1, + "location": 2, + "message": 3 + } + ] + } + }, + { + "taskName": "Exec feature + debug", + "args": [ + "|", + "1bdd", + "${file}", + "-fail-fast", + "-verbose", + "on", + "-out", + "${workspaceRoot}/exec.log" + ], + "echoCommand": true, + "showOutput": "always", + "suppressTaskName": true, + "isTestCommand": false, + "problemMatcher": { + "fileLocation": "absolute", + "pattern": { + "regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)", + "file": 1, + "location": 2, + "message": 3 + } + } + }, + { + "taskName": "Generate feature steps", + "args": [ + "|", + "1bdd", + "gen", + "${file}", + // "-verbose", + // "on", + "-out", + "${workspaceRoot}/exec.log" + ], + "echoCommand": true, + "showOutput": "always", + "suppressTaskName": true, + "isTestCommand": false, + "problemMatcher": { + "fileLocation": "absolute", + "pattern": { + "regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)", + "file": 1, + "location": 2, + "message": 3 + } + } + }, + { + "taskName": "Generate feature steps + debug", + "args": [ + "|", + "1bdd", + "gen", + "${file}", + "-verbose", + "on", + "-out", + "${workspaceRoot}/gen.log" + ], + "echoCommand": true, + "showOutput": "always", + "suppressTaskName": true, + "isTestCommand": false, + "problemMatcher": { + "fileLocation": "absolute", + "pattern": { + "regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)", + "file": 1, + "location": 2, + "message": 3 + } + } + }, + { + "taskName": "OneScript: compile", + "args": [ + "-compile", + "${file}" + ], + "echoCommand": true, + "showOutput": "always", + "suppressTaskName": true, + "isBuildCommand": false + }, + { + "taskName": "OneScript: check", + "args": [ + "-check", + "${file}" + ], + "echoCommand": true, + "showOutput": "always", + "suppressTaskName": true, + "isBuildCommand": false + }, + { + "taskName": "OneScript: make", + "args": [ + "-make", + "${file}", + "${fileBasename}.exe" + ], + "echoCommand": true, + "showOutput": "always", + "suppressTaskName": true, + "isBuildCommand": false + }, + { + "taskName": "OneScript: run", + "args": [ + "${file}" + ], + "echoCommand": true, + "showOutput": "always", + "suppressTaskName": true, + "isBuildCommand": true, + "problemMatcher": { + "fileLocation": "absolute", + "pattern": { + "regexp": "^{Модуль\\s+(.*)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+(.*)}$", + "file": 1, + "location": 2, + "message": 3 + } + } + } + ] } \ No newline at end of file diff --git a/.vscode/tasks.json.old b/.vscode/tasks.json.old deleted file mode 100644 index 6fcfea7..0000000 --- a/.vscode/tasks.json.old +++ /dev/null @@ -1,193 +0,0 @@ -{ - "version": "0.1.0", - "command": "oscript", - "isShellCommand": true, - "showOutput": "silent", - "args": [ - "-encoding=utf-8" - ], - "tasks": [ - { - "taskName": "Exec all features", - "args": [ - "|", - "1bdd", - "${workspaceRoot}/features", - "-fail-fast", - "-out", - "${workspaceRoot}/exec.log" - ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isBuildCommand": true, - "isTestCommand": false, - "problemMatcher": { - "fileLocation": "absolute", - "pattern": { - "regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)", - "file": 1, - "location": 2, - "message": 3 - } - } - }, - { - "taskName": "Exec feature", - "args": [ - "|", - "1bdd", - "${file}", - "-fail-fast", - "-out", - "${workspaceRoot}/exec.log" - ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isTestCommand": true, - "problemMatcher": { - "fileLocation": "absolute", - "pattern": [ - { - "regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)", - "file": 1, - "location": 2, - "message": 3 - } - ] - } - }, - { - "taskName": "Exec feature + debug", - "args": [ - "|", - "1bdd", - "${file}", - "-fail-fast", - "-verbose", - "on", - "-out", - "${workspaceRoot}/exec.log" - ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isTestCommand": false, - "problemMatcher": { - "fileLocation": "absolute", - "pattern": { - "regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)", - "file": 1, - "location": 2, - "message": 3 - } - } - }, - { - "taskName": "Generate feature steps", - "args": [ - "|", - "1bdd", - "gen", - "${file}", - // "-verbose", - // "on", - "-out", - "${workspaceRoot}/exec.log" - ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isTestCommand": false, - "problemMatcher": { - "fileLocation": "absolute", - "pattern": { - "regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)", - "file": 1, - "location": 2, - "message": 3 - } - } - }, - { - "taskName": "Generate feature steps + debug", - "args": [ - "|", - "1bdd", - "gen", - "${file}", - "-verbose", - "on", - "-out", - "${workspaceRoot}/gen.log" - ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isTestCommand": false, - "problemMatcher": { - "fileLocation": "absolute", - "pattern": { - "regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)", - "file": 1, - "location": 2, - "message": 3 - } - } - }, - { - "taskName": "OneScript: compile", - "args": [ - "-compile", - "${file}" - ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isBuildCommand": false - }, - { - "taskName": "OneScript: check", - "args": [ - "-check", - "${file}" - ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isBuildCommand": false - }, - { - "taskName": "OneScript: make", - "args": [ - "-make", - "${file}", - "${fileBasename}.exe" - ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isBuildCommand": false - }, - { - "taskName": "OneScript: run", - "args": [ - "${file}" - ], - "echoCommand": true, - "showOutput": "always", - "suppressTaskName": true, - "isBuildCommand": true, - "problemMatcher": { - "fileLocation": "absolute", - "pattern": { - "regexp": "^{Модуль\\s+(.*)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+(.*)}$", - "file": 1, - "location": 2, - "message": 3 - } - } - } - ] -} \ No newline at end of file From 90d57a78188ebf6ef9a9cd971a9024799feef62d Mon Sep 17 00:00:00 2001 From: Dima Date: Sat, 24 May 2025 13:49:51 +0300 Subject: [PATCH 06/11] fixes --- .vscode/tasks.json | 195 ++++++++++++------ ...21\200\320\270\321\217\320\274\320\270.os" | 5 +- ...21\203\320\273\321\217\320\274\320\270.os" | 15 +- ...3\320\273\321\217\320\274\320\270.feature" | 2 +- packagedef | 7 +- 5 files changed, 152 insertions(+), 72 deletions(-) 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..c21c82f 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 @@ -13,7 +15,7 @@ ВсеШаги.Добавить("ЯДобавляюПодмодульСВеткой"); ВсеШаги.Добавить("ЯОбновляюПодмодули"); ВсеШаги.Добавить("ЯПолучаюСостояниеПодмодулей"); - ВсеШаги.Добавить("СписокПодмодулейСодержитПодмодульCУказателем"); + ВсеШаги.Добавить("СписокПодмодулейСодержитПодмодуль"); Возврат ВсеШаги; КонецФункции @@ -39,11 +41,11 @@ //Я добавляю подмодуль "https://github.com/nixel2007/gitrunner" с веткой "develop" Процедура ЯДобавляюПодмодульСВеткой(Знач АдресВнешнегоРепозитория, Знач ИмяВетки) Экспорт ГитРепозиторий = БДД.ПолучитьИзКонтекста("ГитРепозиторий"); - ГитРепозиторий.ДобавитьПодмодуль(АдресВнешнегоРепозитория, , ИмяВетки) + ГитРепозиторий.ДобавитьПодмодуль(АдресВнешнегоРепозитория, , ИмяВетки); КонецПроцедуры -//Список подмодулей содержит подмодуль "gitrunner" c указателем "develop" -Процедура СписокПодмодулейСодержитПодмодульCУказателем(Знач ИмяПодмодуля, Знач Указатель) Экспорт +//Список подмодулей содержит подмодуль "gitrunner" +Процедура СписокПодмодулейСодержитПодмодуль(Знач ИмяПодмодуля) Экспорт СостояниеПодмодулей = БДД.ПолучитьИзКонтекста("СостояниеПодмодулей"); Нашли = Ложь; @@ -55,8 +57,7 @@ КонецЕсли; Нашли = Истина; - Ожидаем.Что(Подмодуль.Указатель, "Подмодуль содержит неверный указатель").Равно(Указатель); - + КонецЦикла; Ожидаем.Что(Нашли, "Данные о подмодулях не содержат подмодуля " + ИмяПодмодуля).ЭтоИстина(); 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..697173f 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" @@ -15,4 +15,4 @@ Когда Я добавляю подмодуль "https://github.com/nixel2007/gitrunner" с веткой "develop" И Я обновляю подмодули И Я получаю состояние подмодулей - Тогда Список подмодулей содержит подмодуль "gitrunner" c указателем "heads/develop" + Тогда Список подмодулей содержит подмодуль "gitrunner" diff --git a/packagedef b/packagedef index 22732a2..e754bd1 100644 --- a/packagedef +++ b/packagedef @@ -1,12 +1,11 @@ Описание.Имя("gitrunner") .Версия("1.7.1") - .ЗависитОт("1bdd") - .ВерсияСреды("1.7.0") - .ЗависитОт("1commands", "1.3.1") + .ВерсияСреды("1.9.2") + .ЗависитОт("1commands", "1.5.0") .ЗависитОт("asserts", "0.4.0") .ЗависитОт("fs", "0.4.1") .ЗависитОт("json", "1.0.1") - .ЗависитОт("logos", "1.7.0") + .ЗависитОт("logos", "1.7.1") .РазработкаЗависитОт("1bdd", "1.15.1") .Задачи("tasks") .ВключитьФайл("src") From b21e062e5d7f06169358599310efefed5a0ba7bf Mon Sep 17 00:00:00 2001 From: Dima Date: Sat, 24 May 2025 14:23:34 +0300 Subject: [PATCH 07/11] revert chages and fix test --- ...20\264\321\203\320\273\321\217\320\274\320\270.os" | 11 ++++++----- ...4\321\203\320\273\321\217\320\274\320\270.feature" | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) 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 c21c82f..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" @@ -15,7 +15,7 @@ ВсеШаги.Добавить("ЯДобавляюПодмодульСВеткой"); ВсеШаги.Добавить("ЯОбновляюПодмодули"); ВсеШаги.Добавить("ЯПолучаюСостояниеПодмодулей"); - ВсеШаги.Добавить("СписокПодмодулейСодержитПодмодуль"); + ВсеШаги.Добавить("СписокПодмодулейСодержитПодмодульCУказателем"); Возврат ВсеШаги; КонецФункции @@ -41,11 +41,11 @@ //Я добавляю подмодуль "https://github.com/nixel2007/gitrunner" с веткой "develop" Процедура ЯДобавляюПодмодульСВеткой(Знач АдресВнешнегоРепозитория, Знач ИмяВетки) Экспорт ГитРепозиторий = БДД.ПолучитьИзКонтекста("ГитРепозиторий"); - ГитРепозиторий.ДобавитьПодмодуль(АдресВнешнегоРепозитория, , ИмяВетки); + ГитРепозиторий.ДобавитьПодмодуль(АдресВнешнегоРепозитория, , ИмяВетки) КонецПроцедуры -//Список подмодулей содержит подмодуль "gitrunner" -Процедура СписокПодмодулейСодержитПодмодуль(Знач ИмяПодмодуля) Экспорт +//Список подмодулей содержит подмодуль "gitrunner" c указателем "develop" +Процедура СписокПодмодулейСодержитПодмодульCУказателем(Знач ИмяПодмодуля, Знач Указатель) Экспорт СостояниеПодмодулей = БДД.ПолучитьИзКонтекста("СостояниеПодмодулей"); Нашли = Ложь; @@ -57,7 +57,8 @@ КонецЕсли; Нашли = Истина; - + Ожидаем.Что(Подмодуль.Указатель, "Подмодуль содержит неверный указатель").Равно(Указатель); + КонецЦикла; Ожидаем.Что(Нашли, "Данные о подмодулях не содержат подмодуля " + ИмяПодмодуля).ЭтоИстина(); 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 697173f..06ca84f 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" @@ -15,4 +15,4 @@ Когда Я добавляю подмодуль "https://github.com/nixel2007/gitrunner" с веткой "develop" И Я обновляю подмодули И Я получаю состояние подмодулей - Тогда Список подмодулей содержит подмодуль "gitrunner" + Тогда Список подмодулей содержит подмодуль "gitrunner" c указателем "v1.7.0-20-g674ffa7" From 41a267e106595784199197a97ee2d4c91c366980 Mon Sep 17 00:00:00 2001 From: Dima Date: Sat, 24 May 2025 14:25:39 +0300 Subject: [PATCH 08/11] fix branch name --- ...276\320\264\321\203\320\273\321\217\320\274\320\270.feature" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 06ca84f..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 указателем "v1.7.0-20-g674ffa7" From a084ae67869668a8898594b542c00e22067667d7 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Sat, 24 May 2025 14:04:38 +0200 Subject: [PATCH 09/11] 1.8.0 --- packagedef | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packagedef b/packagedef index e754bd1..7fc241d 100644 --- a/packagedef +++ b/packagedef @@ -1,5 +1,5 @@ Описание.Имя("gitrunner") - .Версия("1.7.1") + .Версия("1.8.0") .ВерсияСреды("1.9.2") .ЗависитОт("1commands", "1.5.0") .ЗависитОт("asserts", "0.4.0") From 048fe2763d6bd86258839a1563ed50fd413f8f8c Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Sat, 24 May 2025 14:05:02 +0200 Subject: [PATCH 10/11] default --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bde3dcc..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.9.2', 'stable'] + oscript_version: ['default', 'stable'] uses: autumn-library/workflows/.github/workflows/test.yml@main with: oscript_version: ${{ matrix.oscript_version }} From 48d2c9ce3d4d000b0eb6a68e0ea30a9b4eca06a7 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Sat, 24 May 2025 14:06:20 +0200 Subject: [PATCH 11/11] default --- .github/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) 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 }}