Skip to content

Commit 0bf3e3f

Browse files
authored
Merge pull request #2524 from terrestris/next
SHOGun-GIS-Client V11-`next`
2 parents 48e79f9 + 770f93e commit 0bf3e3f

111 files changed

Lines changed: 20987 additions & 8638 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/on-pull-request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Setup Node.js 🧮
2121
uses: actions/setup-node@v6
2222
with:
23-
node-version: 20
23+
node-version: 24
2424

2525
- name: Cache Node.js modules 💾
2626
uses: actions/cache@v5
@@ -85,7 +85,7 @@ jobs:
8585
hide-summary: false
8686
multiple-files: |
8787
${{ env.MULTIPLE_FILES }}
88-
88+
8989
- name: Get Coverage Comment Id ➡️
9090
if: ${{ env.no_tests_found == 'true' && github.actor != 'dependabot[bot]' }}
9191
id: get-comment-id

.github/workflows/on-push-main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup Node.js 🧮
1919
uses: actions/setup-node@v6
2020
with:
21-
node-version: 20
21+
node-version: 24
2222

2323
- name: Cache Node.js modules 💾
2424
uses: actions/cache@v5
@@ -89,7 +89,7 @@ jobs:
8989
- name: Setup Node.js 🧮
9090
uses: actions/setup-node@v6
9191
with:
92-
node-version: 20
92+
node-version: 24
9393

9494
- name: Cache Node.js modules 💾
9595
uses: actions/cache@v5

.github/workflows/on-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Setup Node.js 🧮
1515
uses: actions/setup-node@v6
1616
with:
17-
node-version: 20
17+
node-version: 24
1818

1919
- name: Cache Node.js modules 💾
2020
uses: actions/cache@v5

.github/workflows/release.yml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ jobs:
1010
release-npm:
1111
name: Release
1212
runs-on: ubuntu-latest
13+
permissions:
14+
id-token: write
15+
contents: write
16+
issues: write
17+
pull-requests: write
1318
outputs:
1419
new_release_published: ${{ steps.semantic.outputs.new_release_published }}
1520
new_release_version: ${{ steps.semantic.outputs.new_release_version }}
@@ -20,7 +25,16 @@ jobs:
2025
- name: Setup Node.js 🧮
2126
uses: actions/setup-node@v6
2227
with:
23-
node-version: 20
28+
node-version: 24
29+
30+
- name: Cache Node.js modules 💾
31+
uses: actions/cache@v4
32+
with:
33+
path: ~/.npm
34+
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }}
35+
restore-keys: |
36+
${{ runner.OS }}-node-
37+
${{ runner.OS }}-
2438
2539
- name: Install dependencies ⏬
2640
run: npm ci
@@ -29,13 +43,14 @@ jobs:
2943
run: npm run build:dist
3044

3145
- name: Semantic Release 🚀
32-
uses: cycjimmy/semantic-release-action@v5
46+
uses: cycjimmy/semantic-release-action@v6
3347
id: semantic
3448
env:
3549
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
36-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
3750
with:
38-
semantic_version: 23
51+
extra_plugins: |
52+
@semantic-release/changelog
53+
@semantic-release/git
3954
release-docker:
4055
needs: release-npm
4156
uses: ./.github/workflows/release_docker.yml

.github/workflows/release_docker.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ jobs:
4242
tags: |
4343
${{ env.DOCKER_REGISTRY }}/shogun-gis-client:latest
4444
load: true
45+
build-args: |
46+
APP_VERSION=latest
47+
GIT_COMMIT=${{ github.sha }}
4548
4649
- name: Build docker image (version)
4750
if: ${{ inputs.release_is_published }} == 'true'
@@ -51,6 +54,9 @@ jobs:
5154
tags: |
5255
${{ env.DOCKER_REGISTRY }}/shogun-gis-client:${{ inputs.release_version }}
5356
load: true
57+
build-args: |
58+
APP_VERSION=${{ inputs.release_version }}
59+
GIT_COMMIT=${{ github.sha }}
5460
5561
- name: Push docker image to Nexus (latest)
5662
run: |

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20
1+
24

.releaserc.json

Lines changed: 17 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,21 @@
55
"range": "8.x",
66
"channel": "8.x"
77
},
8+
{
9+
"name": "9.x",
10+
"range": "9.x",
11+
"channel": "9.x"
12+
},
13+
{
14+
"name": "10.x",
15+
"range": "10.x",
16+
"channel": "10.x"
17+
},
18+
{
19+
"name": "11.x",
20+
"range": "11.x",
21+
"channel": "11.x"
22+
},
823
{
924
"name": "main"
1025
},
@@ -14,100 +29,8 @@
1429
}
1530
],
1631
"plugins": [
17-
[
18-
"@semantic-release/commit-analyzer",
19-
{
20-
"releaseRules": [
21-
{
22-
"type": "breaking",
23-
"release": "major"
24-
},
25-
{
26-
"type": "ci",
27-
"release": false
28-
},
29-
{
30-
"type": "config",
31-
"release": "patch"
32-
},
33-
{
34-
"type": "norelease",
35-
"release": false
36-
},
37-
{
38-
"type": "refactor",
39-
"release": "patch"
40-
},
41-
{
42-
"type": "style",
43-
"release": "patch"
44-
},
45-
{
46-
"type": "test",
47-
"release": false
48-
}
49-
]
50-
}
51-
],
52-
[
53-
"@semantic-release/release-notes-generator",
54-
{
55-
"preset": "conventionalcommits",
56-
"presetConfig": {
57-
"header": "Changelog of shogun-admin",
58-
"types": [
59-
{
60-
"type": "breaking",
61-
"section": "Breaking changes"
62-
},
63-
{
64-
"type": "chore",
65-
"section": "Dependencies"
66-
},
67-
{
68-
"type": "ci",
69-
"section": "Changes in configuration"
70-
},
71-
{
72-
"type": "config",
73-
"section": "Changes in configuration"
74-
},
75-
{
76-
"type": "docs",
77-
"hidden": true
78-
},
79-
{
80-
"type": "feat",
81-
"section": "Features"
82-
},
83-
{
84-
"type": "fix",
85-
"section": "Bugfixes"
86-
},
87-
{
88-
"type": "norelease",
89-
"hidden": true
90-
},
91-
{
92-
"type": "perf",
93-
"hidden": true
94-
},
95-
{
96-
"type": "refactor",
97-
"hidden": true
98-
},
99-
{
100-
"type": "style",
101-
"section": "Changes in layout"
102-
},
103-
{
104-
"type": "test",
105-
"hidden": true
106-
}
107-
]
108-
}
109-
}
110-
],
32+
"@semantic-release/commit-analyzer",
33+
"@semantic-release/release-notes-generator",
11134
"@semantic-release/npm",
11235
"@semantic-release/changelog",
11336
[

0 commit comments

Comments
 (0)