Skip to content

Commit d8dc589

Browse files
nixel2007nixel2007
authored
Merge pull request #63 from ovcharenko-di/patch-1
Fix "fatal: no such section: bak.user"
2 parents 674ffa7 + 48d2c9c commit d8dc589

File tree

8 files changed

+155
-72
lines changed

8 files changed

+155
-72
lines changed

‎.github/workflows/release.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ jobs:
1010
release:
1111
uses: autumn-library/workflows/.github/workflows/release.yml@main
1212
with:
13-
oscript_version: '1.8.3'
1413
package_mask: "gitrunner-*.ospx"
1514
secrets:
1615
PUSH_TOKEN: ${{ secrets.PUSH_TOKEN }}

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
oscript_version: ['1.8.3', 'stable']
13+
oscript_version: ['default', 'stable']
1414
uses: autumn-library/workflows/.github/workflows/test.yml@main
1515
with:
1616
oscript_version: ${{ matrix.oscript_version }}

‎.vscode/tasks.json‎

Lines changed: 136 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,39 @@
11
{
2-
"version": "0.1.0",
2+
"version": "2.0.0",
33
"command": "oscript",
4-
"isShellCommand": true,
5-
"showOutput": "silent",
4+
"presentation": {
5+
"echo": true,
6+
"reveal": "always",
7+
"focus": false,
8+
"panel": "shared",
9+
"showReuseMessage": true,
10+
"clear": false
11+
},
612
"args": [
713
"-encoding=utf-8"
814
],
915
"tasks": [
1016
{
11-
"taskName": "Exec all features",
17+
"type": "shell",
18+
"label": "Exec all features",
19+
"command":[
20+
"1bdd"
21+
],
1222
"args": [
13-
"|",
14-
"1bdd",
1523
"${workspaceRoot}/features",
1624
"-fail-fast",
1725
"-out",
1826
"${workspaceRoot}/exec.log"
1927
],
20-
"echoCommand": true,
21-
"showOutput": "always",
22-
"suppressTaskName": true,
23-
"isBuildCommand": true,
24-
"isTestCommand": false,
28+
"presentation": {
29+
"echo": true,
30+
"reveal": "always",
31+
"focus": false,
32+
"panel": "shared",
33+
"showReuseMessage": true,
34+
"clear": false
35+
},
36+
"group": "test",
2537
"problemMatcher": {
2638
"fileLocation": "absolute",
2739
"pattern": {
@@ -33,19 +45,26 @@
3345
}
3446
},
3547
{
36-
"taskName": "Exec feature",
48+
"type": "shell",
49+
"label": "Exec feature",
50+
"command":[
51+
"1bdd"
52+
],
3753
"args": [
38-
"|",
39-
"1bdd",
4054
"${file}",
4155
"-fail-fast",
4256
"-out",
4357
"${workspaceRoot}/exec.log"
4458
],
45-
"echoCommand": true,
46-
"showOutput": "always",
47-
"suppressTaskName": true,
48-
"isTestCommand": true,
59+
"presentation": {
60+
"echo": true,
61+
"reveal": "always",
62+
"focus": false,
63+
"panel": "shared",
64+
"showReuseMessage": true,
65+
"clear": false
66+
},
67+
"group": "test",
4968
"problemMatcher": {
5069
"fileLocation": "absolute",
5170
"pattern": [
@@ -59,21 +78,29 @@
5978
}
6079
},
6180
{
62-
"taskName": "Exec feature + debug",
81+
"type": "shell",
82+
"label": "Exec feature + debug",
83+
"command":[
84+
"1bdd"
85+
86+
],
6387
"args": [
64-
"|",
65-
"1bdd",
6688
"${file}",
6789
"-fail-fast",
6890
"-verbose",
6991
"on",
7092
"-out",
7193
"${workspaceRoot}/exec.log"
7294
],
73-
"echoCommand": true,
74-
"showOutput": "always",
75-
"suppressTaskName": true,
76-
"isTestCommand": false,
95+
"presentation": {
96+
"echo": true,
97+
"reveal": "always",
98+
"focus": false,
99+
"panel": "shared",
100+
"showReuseMessage": true,
101+
"clear": false
102+
},
103+
"group": "test",
77104
"problemMatcher": {
78105
"fileLocation": "absolute",
79106
"pattern": {
@@ -85,21 +112,28 @@
85112
}
86113
},
87114
{
88-
"taskName": "Generate feature steps",
115+
"type": "shell",
116+
"label": "Generate feature steps",
117+
"command":[
118+
"1bdd"
119+
],
89120
"args": [
90-
"|",
91-
"1bdd",
92121
"gen",
93122
"${file}",
94123
// "-verbose",
95124
// "on",
96125
"-out",
97126
"${workspaceRoot}/exec.log"
98127
],
99-
"echoCommand": true,
100-
"showOutput": "always",
101-
"suppressTaskName": true,
102-
"isTestCommand": false,
128+
"presentation": {
129+
"echo": true,
130+
"reveal": "always",
131+
"focus": false,
132+
"panel": "shared",
133+
"showReuseMessage": true,
134+
"clear": false
135+
},
136+
"group": "build",
103137
"problemMatcher": {
104138
"fileLocation": "absolute",
105139
"pattern": {
@@ -111,21 +145,28 @@
111145
}
112146
},
113147
{
114-
"taskName": "Generate feature steps + debug",
148+
"type": "shell",
149+
"label": "Generate feature steps + debug",
150+
"command":[
151+
"1bdd"
152+
],
115153
"args": [
116-
"|",
117-
"1bdd",
118154
"gen",
119155
"${file}",
120156
"-verbose",
121157
"on",
122158
"-out",
123159
"${workspaceRoot}/gen.log"
124160
],
125-
"echoCommand": true,
126-
"showOutput": "always",
127-
"suppressTaskName": true,
128-
"isTestCommand": false,
161+
"presentation": {
162+
"echo": true,
163+
"reveal": "always",
164+
"focus": false,
165+
"panel": "shared",
166+
"showReuseMessage": true,
167+
"clear": false
168+
},
169+
"group": "build",
129170
"problemMatcher": {
130171
"fileLocation": "absolute",
131172
"pattern": {
@@ -137,48 +178,84 @@
137178
}
138179
},
139180
{
140-
"taskName": "OneScript: compile",
181+
"type": "shell",
182+
"label": "OneScript: compile",
183+
"command":[
184+
"oscript"
185+
],
141186
"args": [
142187
"-compile",
143188
"${file}"
144189
],
145-
"echoCommand": true,
146-
"showOutput": "always",
147-
"suppressTaskName": true,
148-
"isBuildCommand": false
190+
"presentation": {
191+
"echo": true,
192+
"reveal": "always",
193+
"focus": false,
194+
"panel": "shared",
195+
"showReuseMessage": true,
196+
"clear": false
197+
},
198+
"group": "test",
149199
},
150200
{
151-
"taskName": "OneScript: check",
201+
"type": "shell",
202+
"label": "OneScript: check",
203+
"command":[
204+
"oscript"
205+
],
152206
"args": [
153207
"-check",
154208
"${file}"
155209
],
156-
"echoCommand": true,
157-
"showOutput": "always",
158-
"suppressTaskName": true,
159-
"isBuildCommand": false
210+
"presentation": {
211+
"echo": true,
212+
"reveal": "always",
213+
"focus": false,
214+
"panel": "shared",
215+
"showReuseMessage": true,
216+
"clear": false
217+
},
218+
"group": "test",
160219
},
161220
{
162-
"taskName": "OneScript: make",
221+
"type": "shell",
222+
"label": "OneScript: make",
223+
"command":[
224+
"oscript"
225+
],
163226
"args": [
164227
"-make",
165228
"${file}",
166229
"${fileBasename}.exe"
167230
],
168-
"echoCommand": true,
169-
"showOutput": "always",
170-
"suppressTaskName": true,
171-
"isBuildCommand": false
231+
"presentation": {
232+
"echo": true,
233+
"reveal": "always",
234+
"focus": false,
235+
"panel": "shared",
236+
"showReuseMessage": true,
237+
"clear": false
238+
},
239+
"group": "test",
172240
},
173241
{
174-
"taskName": "OneScript: run",
242+
"type": "shell",
243+
"label": "OneScript: run",
244+
"command":[
245+
"oscript"
246+
],
175247
"args": [
176248
"${file}"
177249
],
178-
"echoCommand": true,
179-
"showOutput": "always",
180-
"suppressTaskName": true,
181-
"isBuildCommand": true,
250+
"presentation": {
251+
"echo": true,
252+
"reveal": "always",
253+
"focus": false,
254+
"panel": "shared",
255+
"showReuseMessage": true,
256+
"clear": false
257+
},
258+
"group": "build",
182259
"problemMatcher": {
183260
"fileLocation": "absolute",
184261
"pattern": {

‎features/step_definitions/РаботаСВнешнимиРепозиториями.os‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
// Реализация шагов BDD-фич/сценариев c помощью фреймворка https://github.com/artbear/1bdd
1+
// BSLLS:MissingReturnedValueDescription-off
2+
// BSLLS:MissingParameterDescription-off
3+
4+
// Реализация шагов BDD-фич/сценариев c помощью фреймворка https://github.com/artbear/1bdd
25

36
#Использовать asserts
47

‎features/step_definitions/РаботаСПодмодулями.os‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// Реализация шагов BDD-фич/сценариев c помощью фреймворка https://github.com/artbear/1bdd
1+
// BSLLS:MissingParameterDescription-off
2+
3+
// Реализация шагов BDD-фич/сценариев c помощью фреймворка https://github.com/artbear/1bdd
24

35
#Использовать asserts
46

‎features/РаботаСПодмодулями.feature‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
И Я инициализирую репозиторий во временном каталоге
1313

1414
Сценарий: Добавление подмодуля
15-
Когда Я добавляю подмодуль "https://github.com/nixel2007/gitrunner" с веткой "develop"
15+
Когда Я добавляю подмодуль "https://github.com/nixel2007/gitrunner" с веткой "gitrunner-submodule-test"
1616
И Я обновляю подмодули
1717
И Я получаю состояние подмодулей
18-
Тогда Список подмодулей содержит подмодуль "gitrunner" c указателем "heads/develop"
18+
Тогда Список подмодулей содержит подмодуль "gitrunner" c указателем "v1.7.0-20-g674ffa7"

‎packagedef‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
Описание.Имя("gitrunner")
2-
.Версия("1.7.1")
3-
.ЗависитОт("1bdd")
4-
.ВерсияСреды("1.7.0")
5-
.ЗависитОт("1commands", "1.3.1")
2+
.Версия("1.8.0")
3+
.ВерсияСреды("1.9.2")
4+
.ЗависитОт("1commands", "1.5.0")
65
.ЗависитОт("asserts", "0.4.0")
76
.ЗависитОт("fs", "0.4.1")
87
.ЗависитОт("json", "1.0.1")
9-
.ЗависитОт("logos", "1.0.0")
10-
.РазработкаЗависитОт("1bdd", "1.13.0")
8+
.ЗависитОт("logos", "1.7.1")
9+
.РазработкаЗависитОт("1bdd", "1.15.1")
1110
.Задачи("tasks")
1211
.ВключитьФайл("src")
1312
.ВключитьФайл("features")

‎src/ГитРепозиторий.os‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,10 @@
158158
Если НадоОчиститьУстановленныеПеременные Тогда
159159
ОчиститьУстановленныеПеременныеГит();
160160
КонецЕсли;
161-
ВосстановитьКоммитера();
161+
162+
Если Не ПустаяСтрока(Коммитер) Тогда
163+
ВосстановитьКоммитера();
164+
КонецЕсли;
162165

163166
Если НадоУдалитьВременныйФайлКомментария Тогда
164167
Попытка

0 commit comments

Comments
 (0)