Skip to content

Commit 002eecf

Browse files
authored
fix: upgrade to reuseable-ci 2.6.x and just (#475)
* build: update justfile and reuseable-ci * fix: correct lintwarning multiple run for container * ci: use reuseable ci 2.6.0 --------- Signed-off-by: Josef Andersson <josef.andersson@digg.se>
1 parent 782ef73 commit 002eecf

16 files changed

+495
-270
lines changed

.conform.yaml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
# SPDX-FileCopyrightText: 2025 Digg - Agency for Digital Government
2-
#
3-
# SPDX-License-Identifier: CC0-1.0
4-
5-
---
61
policies:
72
- type: commit
83
spec:
@@ -17,6 +12,6 @@ policies:
1712
body:
1813
required: false
1914
conventional:
20-
types: ['chore', 'build', 'docs', 'ci', 'perf', 'refactor', 'style', 'test', 'release']
21-
scopes: ['.*']
15+
types: ["build", "chore", "docs", "ci", "perf", "refactor", "style", "test", "release"]
16+
scopes: [".*"]
2217
descriptionLength: 92

.github/artifacts.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
# Artifacts Configuration for rest-api-profil-lint-processor
66
# NPM CLI application with container
77
# Package tarballs will be attached to GitHub Release as assets
8-
98
artifacts:
109
- name: raplp
1110
project-type: npm
@@ -15,7 +14,6 @@ artifacts:
1514
- github-packages
1615
config:
1716
node-version: 24
18-
1917
# Container builds from source (no artifact dependency)
2018
# Containerfile copies source code and runs npm install
2119
containers:

.github/workflows/openssf-scorecard.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
# SPDX-FileCopyrightText: 2025 Digg - Agency for Digital Government
22
#
33
# SPDX-License-Identifier: CC0-1.0
4-
5-
---
64
name: OpenSSF Scorecard Analysis
75
on:
86
schedule:
97
# Saturdays at 02:20 UTC
10-
- cron: "20 2 * * 6"
8+
- cron: '20 2 * * 6'
119
# Wednesdays at 02:20 UTC
12-
- cron: "20 2 * * 3"
10+
- cron: '20 2 * * 3'
1311
workflow_dispatch:
14-
1512
permissions:
1613
contents: read
17-
1814
jobs:
1915
scorecard-analysis:
2016
permissions:

.github/workflows/pullrequest-workflow.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
# SPDX-FileCopyrightText: 2025 Digg - Agency for Digital Government
22
#
33
# SPDX-License-Identifier: CC0-1.0
4-
5-
---
64
name: Pull Request Workflow
7-
85
on:
96
pull_request:
107
branches:
118
- main
129
- develop
1310
- 'release/**'
1411
- 'feature/**'
15-
1612
permissions:
1713
contents: read # Best Security practice. Jobs only get read as base, and then permissions are added as needed
18-
1914
jobs:
2015
pr-checks:
2116
uses: diggsweden/reusable-ci/.github/workflows/pullrequest-orchestrator.yml@e1e1387d5b0399bb5edb00e40485746772344176 # v2.6.0
@@ -26,10 +21,12 @@ jobs:
2621
security-events: write # Upload ESLint/security findings to GitHub Security tab
2722
with:
2823
project-type: npm
29-
# MegaLinter is disabled for this project
30-
linters.megalint: false # Skip MegaLinter
24+
# Use devbase-check linting (replaces megalint, commitlint, licenselint)
25+
linters.devbasecheck: true
26+
linters.megalint: false
27+
linters.commitlint: false
28+
linters.licenselint: false
3129
linters.publiccodelint: true
32-
3330
test:
3431
needs: [pr-checks]
3532
if: always() # Run tests even if linting fails (get full CI feedback)

.github/workflows/release-dev-workflow.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,11 @@
1717
# - NPM package: @diggsweden/rest-api-profil-lint-processor@0.5.9-dev-feat-name-abc1234
1818
# - Container image: ghcr.io/diggsweden/rest-api-profil-lint-processor:0.5.9-dev-feat-name-abc1234
1919
# - Tagged with 'dev' (not 'latest')
20-
2120
name: Release Workflow Dev
22-
2321
on:
2422
workflow_dispatch:
25-
2623
permissions:
2724
contents: read
28-
2925
jobs:
3026
dev-release:
3127
permissions:

.github/workflows/release-workflow.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,19 @@
44

55
# Release Workflow for rest-api-profil-lint-processor
66
# Uses the unified release orchestrator for NPM packages
7-
---
87
name: Release
9-
108
on:
119
push:
1210
tags:
1311
- 'v[0-9]+.[0-9]+.[0-9]+' # Stable: v1.0.0
1412
- 'v[0-9]+.[0-9]+.[0-9]+-alpha*' # Alpha: v1.0.0-alpha.1
1513
- 'v[0-9]+.[0-9]+.[0-9]+-beta*' # Beta: v1.0.0-beta.1
1614
- 'v[0-9]+.[0-9]+.[0-9]+-rc*' # RC: v1.0.0-rc.1
17-
1815
concurrency:
1916
group: release-${{ github.ref }}
2017
cancel-in-progress: false # Queue releases, don't cancel partial releases
21-
2218
permissions:
2319
contents: read # Best Security practice. Jobs only get read as base, and then permissions are added as needed
24-
2520
jobs:
2621
release:
2722
uses: diggsweden/reusable-ci/.github/workflows/release-orchestrator.yml@e1e1387d5b0399bb5edb00e40485746772344176 # v2.6.0

.mise.toml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# SPDX-FileCopyrightText: 2025 Digg - Agency for Digital Government
2+
#
3+
# SPDX-License-Identifier: CC0-1.0
4+
5+
[settings]
6+
experimental = true
7+
paranoid = true
8+
9+
[env]
10+
HTTP_PROXY = "{{ get_env(name='HTTP_PROXY', default='') }}"
11+
HTTPS_PROXY = "{{ get_env(name='HTTPS_PROXY', default='') }}"
12+
NO_PROXY = "{{ get_env(name='NO_PROXY', default='') }}"
13+
http_proxy = "{{ get_env(name='http_proxy', default='') }}"
14+
https_proxy = "{{ get_env(name='https_proxy', default='') }}"
15+
no_proxy = "{{ get_env(name='no_proxy', default='') }}"
16+
PIP_INDEX_URL = "{{ get_env(name='PIP_INDEX_URL', default='') }}"
17+
18+
[tools]
19+
node = "22"
20+
"aqua:casey/just" = "1.43.0"
21+
"aqua:rhysd/actionlint" = "v1.7.8"
22+
"aqua:siderolabs/conform" = "v0.1.0-alpha.30"
23+
"aqua:zricethezav/gitleaks" = "v8.29.1"
24+
"ubi:rvben/rumdl" = "v0.0.173"
25+
"aqua:koalaman/shellcheck" = "v0.11.0"
26+
"aqua:mvdan/sh" = "v3.12.0"
27+
"aqua:google/yamlfmt" = "v0.20.0"
28+
"aqua:hadolint/hadolint" = "v2.12.0"
29+
"pipx:reuse" = "6.2.0"

.yamlfmt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# SPDX-FileCopyrightText: 2025 Digg - Agency for Digital Government
2+
#
3+
# SPDX-License-Identifier: CC0-1.0
4+
5+
exclude:
6+
- apis/
7+
- node_modules/
8+
- dist/
9+
- coverage/

Containerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ RUN npm ci --no-audit --no-fund --ignore-scripts
1111

1212
COPY . .
1313

14-
RUN npm run build
15-
16-
RUN npm prune --omit=dev
14+
RUN npm run build && \
15+
npm prune --omit=dev
1716

1817
FROM node:24.11.0-slim AS runtime
1918
ENV NODE_ENV=production

REUSE.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ version = 1
66

77
# configurations
88
[[annotations]]
9-
path = ["CHANGELOG.md","tsconfig.json","package.json","package-lock.json"]
9+
path = ["CHANGELOG.md","tsconfig.json","package.json","package-lock.json",".conform.yaml"]
1010
precedence = "aggregate"
1111
SPDX-FileCopyrightText = "2025 Digg - Agency for Digital Government"
1212
SPDX-License-Identifier = "CC0-1.0"

0 commit comments

Comments
 (0)