@jakubmazanec/carson-templates 3.3.0-next.e20bd97a → 3.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jakubmazanec/carson-templates",
|
|
3
|
-
"version": "3.3.0
|
|
3
|
+
"version": "3.3.0",
|
|
4
4
|
"description": "Collection of Carson templates.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -34,9 +34,9 @@
|
|
|
34
34
|
"semver": "^7.6.3"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
|
-
"@jakubmazanec/carson": "1.3.0
|
|
38
|
-
"@jakubmazanec/eslint-config": "4.1.
|
|
39
|
-
"@jakubmazanec/fs-utils": "0.2.
|
|
37
|
+
"@jakubmazanec/carson": "^1.3.0",
|
|
38
|
+
"@jakubmazanec/eslint-config": "^4.1.0",
|
|
39
|
+
"@jakubmazanec/fs-utils": "^0.2.0",
|
|
40
40
|
"@types/fs-extra": "^11.0.4",
|
|
41
41
|
"@types/lodash": "^4.17.13",
|
|
42
42
|
"@types/node": "^22.10.2",
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
"zen-observable": "^0.10.0"
|
|
59
59
|
},
|
|
60
60
|
"peerDependencies": {
|
|
61
|
-
"@jakubmazanec/carson": "1.
|
|
61
|
+
"@jakubmazanec/carson": "^1.0.0"
|
|
62
62
|
},
|
|
63
63
|
"packageManager": "npm@10.9.0",
|
|
64
64
|
"engines": {
|
|
@@ -207,6 +207,25 @@ for (let project of workspace.projects) {
|
|
|
207
207
|
run: |
|
|
208
208
|
git push --follow-tags
|
|
209
209
|
|
|
210
|
+
- name: Checkout development branch
|
|
211
|
+
run: |
|
|
212
|
+
git fetch -p origin
|
|
213
|
+
git checkout -B <%- getDevelopmentBranch(workspace) %>
|
|
214
|
+
git branch --set-upstream-to=origin/<%- getDevelopmentBranch(workspace) %> <%- getDevelopmentBranch(workspace) %>
|
|
215
|
+
git reset --hard origin/<%- getDevelopmentBranch(workspace) %>
|
|
216
|
+
|
|
217
|
+
- name: Merge and commit
|
|
218
|
+
run: |
|
|
219
|
+
git merge <%- getMainBranch(workspace) %> --no-verify
|
|
220
|
+
git push -u origin <%- getDevelopmentBranch(workspace) %> --no-verify
|
|
221
|
+
|
|
222
|
+
- name: Checkout main branch
|
|
223
|
+
run: |
|
|
224
|
+
git checkout -B <%- getMainBranch(workspace) %>
|
|
225
|
+
git branch --set-upstream-to=origin/<%- getMainBranch(workspace) %> <%- getMainBranch(workspace) %>
|
|
226
|
+
git reset --hard origin/<%- getMainBranch(workspace) %>
|
|
227
|
+
git pull
|
|
228
|
+
|
|
210
229
|
<%
|
|
211
230
|
for (let project of workspace.projects) {
|
|
212
231
|
if (project.config.deployment?.appName && project.config.deployment?.dbInstance) {
|
|
@@ -248,25 +267,6 @@ for (let project of workspace.projects) {
|
|
|
248
267
|
}
|
|
249
268
|
-%>
|
|
250
269
|
|
|
251
|
-
- name: Checkout main branch
|
|
252
|
-
run: |
|
|
253
|
-
git fetch -p origin
|
|
254
|
-
git checkout <%- getMainBranch(workspace) %>
|
|
255
|
-
git branch --set-upstream-to=origin/<%- getMainBranch(workspace) %> <%- getMainBranch(workspace) %>
|
|
256
|
-
git reset --hard origin/<%- getMainBranch(workspace) %>
|
|
257
|
-
git pull
|
|
258
|
-
|
|
259
|
-
- name: Checkout development branch
|
|
260
|
-
run: |
|
|
261
|
-
git checkout -B <%- getDevelopmentBranch(workspace) %>
|
|
262
|
-
git branch --set-upstream-to=origin/<%- getDevelopmentBranch(workspace) %> <%- getDevelopmentBranch(workspace) %>
|
|
263
|
-
git reset --hard origin/<%- getDevelopmentBranch(workspace) %>
|
|
264
|
-
|
|
265
|
-
- name: Merge and commit
|
|
266
|
-
run: |
|
|
267
|
-
git merge <%- getMainBranch(workspace) %> --no-verify
|
|
268
|
-
git push -u origin <%- getDevelopmentBranch(workspace) %> --no-verify
|
|
269
|
-
|
|
270
270
|
release_development_branch:
|
|
271
271
|
name: Release preview
|
|
272
272
|
if: ${{ github.ref_name == '<%- getDevelopmentBranch(workspace) %>' }}
|