Skip to content

Commit e3d93f2

Browse files
mmwinthermmwinther
committed
Merge remote-tracking branch 'origin/main' into feat/upgrade-to-spring-3
2 parents 5b0d2e1 + f683dbc commit e3d93f2

40 files changed

+2462
-1272
lines changed

‎.github/dependabot.yml‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,42 @@ version: 2
77
updates:
88
- package-ecosystem: "maven" # See documentation for possible values
99
directory: "/" # Location of package manifests
10+
exclude-paths:
11+
- klass-forvaltning # Versions can't be upgraded due to Vaadin
12+
- klass-solr # Not necessary to update
13+
- klass-api # Has its own config below
14+
- klass-shared # Has its own config below
15+
- klass-mail # Has its own config below
1016
schedule:
11-
interval: "daily"
17+
interval: "weekly"
18+
groups:
19+
klass-root:
20+
patterns:
21+
- "*"
22+
- package-ecosystem: "maven" # See documentation for possible values
23+
directory: "/klass-api" # Location of package manifests
24+
schedule:
25+
interval: "weekly"
26+
groups:
27+
klass-api:
28+
patterns:
29+
- "*"
30+
- package-ecosystem: "maven" # See documentation for possible values
31+
directory: "/klass-shared" # Location of package manifests
32+
schedule:
33+
interval: "weekly"
34+
groups:
35+
klass-shared:
36+
patterns:
37+
- "*"
38+
- package-ecosystem: "maven" # See documentation for possible values
39+
directory: "/klass-mail" # Location of package manifests
40+
schedule:
41+
interval: "weekly"
42+
groups:
43+
klass-mail:
44+
patterns:
45+
- "*"
1246
- package-ecosystem: "github-actions" # See documentation for possible values
1347
directory: "/" # Location of package manifests
1448
schedule:

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
# make release
7272
# Build all modules except klass-forvaltning since it is not compatible with JDK 17
7373
- name: Build with Maven
74-
run: mvn -B clean install --settings=.maven.settings.xml -pl '!:klass-forvaltning'
74+
run: mvn -B clean install --settings=.maven.settings.xml
7575

7676
- name: Set up JDK 1.8
7777
uses: actions/setup-java@v4
@@ -82,7 +82,8 @@ jobs:
8282

8383
# Build only klass-forvaltning with JDK 1.8
8484
- name: Build, test and package with Maven
85-
run: mvn --batch-mode --update-snapshots package -Djava.version=1.8 -pl :klass-forvaltning -am
85+
working-directory: klass-forvaltning
86+
run: mvn --batch-mode --update-snapshots package -Djava.version=1.8 -am
8687
env:
8788
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8889

‎.github/workflows/klass-api-build-and-deploy.yaml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
types: [ published ]
66
push:
77
branches:
8-
- nais-migration
8+
- main
99
paths:
1010
- "klass-api/**"
1111
- "klass-shared/**"
@@ -52,23 +52,20 @@ jobs:
5252
uses: "nais/what-changed@main"
5353
with:
5454
files: .nais/**/klass-api.yaml
55-
main-branch-name: 'nais-migration' #TODO: Remove when we change branch back to main
5655
- name: Check for test config changes
5756
id: test-config-changed
5857
uses: "nais/what-changed@main"
5958
with:
6059
files: .nais/test/klass-api.yaml
61-
main-branch-name: 'nais-migration' #TODO: Remove when we change branch back to main
6260
- name: Check for prod config changes
6361
id: prod-config-changed
6462
uses: "nais/what-changed@main"
6563
with:
6664
files: .nais/prod/klass-api.yaml
67-
main-branch-name: 'nais-migration' #TODO: Remove when we change branch back to main
6865

6966
- name: Build with Maven
7067
if: steps.changed-files.outputs.changed != 'only-inputs' || github.event.inputs.cluster == 'test' || github.event.inputs.cluster == 'prod'
71-
run: mvn --batch-mode --update-snapshots install -pl '!:klass-forvaltning'
68+
run: mvn --batch-mode --update-snapshots install
7269
env:
7370
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7471

‎.github/workflows/klass-api-dev-build-and-deploy.yml‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
name: klass-api-dev-build-and-deploy.yml
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
app:
6+
description: "Specify a custom name for your app"
7+
required: true
8+
type: string
9+
ttl:
10+
description: "Select required time for app to live"
11+
required: true
12+
default: '1h'
13+
type: choice
14+
options:
15+
- 1h
16+
- 2h
17+
- 4h
18+
- 8h
19+
- 36h
20+
jobs:
21+
build:
22+
name: Build
23+
permissions:
24+
contents: "read"
25+
id-token: "write"
26+
packages: "read"
27+
runs-on: ubuntu-latest
28+
outputs:
29+
image: ${{ steps.docker-build-push.outputs.image }}
30+
telemetry: ${{ steps.docker-build-push.outputs.telemetry }}
31+
test-config-changed: ${{ steps.test-config-changed.outputs.changed != 'non-inputs' }}
32+
only-config-changed: ${{ steps.changed-files.outputs.changed == 'only-inputs'}}
33+
34+
steps:
35+
- name: Checkout
36+
uses: actions/checkout@v4
37+
with:
38+
fetch-depth: 0
39+
- uses: actions/setup-java@v4
40+
with:
41+
distribution: 'temurin'
42+
java-version: '17'
43+
cache: 'maven'
44+
45+
- name: Check what changed
46+
id: changed-files
47+
uses: "nais/what-changed@main"
48+
with:
49+
files: .nais/**/klass-api-dev.yaml
50+
main-branch-name: 'main'
51+
- name: Check for test config changes
52+
id: test-config-changed
53+
uses: "nais/what-changed@main"
54+
with:
55+
files: .nais/test/klass-api-dev.yaml
56+
main-branch-name: 'main'
57+
58+
- name: Build with Maven
59+
if: steps.changed-files.outputs.changed != 'only-inputs'
60+
run: mvn --batch-mode --update-snapshots install
61+
env:
62+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
63+
64+
- name: Build and push
65+
if: steps.changed-files.outputs.changed != 'only-inputs'
66+
uses: nais/docker-build-push@v0
67+
id: docker-build-push
68+
with:
69+
team: dapla-metadata
70+
image_suffix: api
71+
dockerfile: klass-api/Dockerfile
72+
docker_context: klass-api
73+
74+
deploy-test:
75+
name: Deploy to test
76+
needs: build
77+
permissions:
78+
contents: "read"
79+
id-token: "write"
80+
packages: "read"
81+
runs-on: ubuntu-latest
82+
steps:
83+
- name: Checkout
84+
uses: actions/checkout@v4
85+
86+
- uses: nais/deploy/actions/deploy@v2
87+
env:
88+
CLUSTER: test
89+
RESOURCE: .nais/test/klass-api-dev.yaml
90+
DEPLOY_SERVER: deploy.ssb.cloud.nais.io:443
91+
WORKLOAD_IMAGE: ${{ needs.build.outputs.image }}
92+
VAR: app-name=${{ github.event.inputs.app }},time-to-live=${{ github.event.inputs.ttl }}
93+
TELEMETRY: ${{ needs.build.outputs.telemetry }}

‎.github/workflows/klass-forvaltning-build-and-deploy.yaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
types: [ published ]
66
push:
77
branches:
8-
- nais-migration
8+
- main
99
paths:
1010
- "klass-forvaltning/**"
1111
- ".nais/**/klass-forvaltning.yaml"
@@ -51,19 +51,16 @@ jobs:
5151
uses: "nais/what-changed@main"
5252
with:
5353
files: .nais/**/klass-forvaltning.yaml
54-
main-branch-name: 'nais-migration' #TODO: Remove when we change branch back to main
5554
- name: Check for test config changes
5655
id: test-config-changed
5756
uses: "nais/what-changed@main"
5857
with:
5958
files: .nais/test/klass-forvaltning.yaml
60-
main-branch-name: 'nais-migration' #TODO: Remove when we change branch back to main
6159
- name: Check for prod config changes
6260
id: prod-config-changed
6361
uses: "nais/what-changed@main"
6462
with:
6563
files: .nais/prod/klass-forvaltning.yaml
66-
main-branch-name: 'nais-migration' #TODO: Remove when we change branch back to main
6764
- name: Build with Maven
6865
if: steps.changed-files.outputs.changed != 'only-inputs' || github.event.inputs.cluster == 'test' || github.event.inputs.cluster == 'prod'
6966
working-directory: klass-forvaltning

‎.github/workflows/klass-mail-build-and-deploy.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
types: [ published ]
66
push:
77
branches:
8-
- nais-migration
8+
- main
99
paths:
1010
- "klass-mail/**"
1111
- ".nais/**/klass-mail.yaml"
@@ -40,17 +40,15 @@ jobs:
4040
uses: "nais/what-changed@main"
4141
with:
4242
files: .nais/**/klass-mail.yaml
43-
main-branch-name: 'nais-migration' #TODO: Remove when we change branch back to main
4443
- name: Check for prod config changes
4544
id: prod-config-changed
4645
uses: "nais/what-changed@main"
4746
with:
4847
files: .nais/prod/klass-mail.yaml
49-
main-branch-name: 'nais-migration' #TODO: Remove when we change branch back to main
5048

5149
- name: Build with Maven
5250
if: steps.changed-files.outputs.changed != 'only-inputs'
53-
run: mvn --batch-mode --update-snapshots install -pl '!:klass-forvaltning'
51+
run: mvn --batch-mode --update-snapshots install
5452
env:
5553
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5654

@@ -104,4 +102,4 @@ jobs:
104102
RESOURCE: .nais/prod/klass-mail.yaml
105103
DEPLOY_SERVER: deploy.ssb.cloud.nais.io:443
106104
WORKLOAD_IMAGE: ${{ needs.build.outputs.image }}
107-
TELEMETRY: ${{ needs.build.outputs.telemetry }}
105+
TELEMETRY: ${{ needs.build.outputs.telemetry }}

‎.github/workflows/klass-solr-deploy.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Klass-solr deploy
33
on:
44
push:
55
branches:
6-
- nais-migration
6+
- main
77
paths:
88
- ".nais/**/klass-solr.yaml"
99
- ".github/workflows/klass-solr-deploy.yaml"
@@ -41,14 +41,12 @@ jobs:
4141
uses: "nais/what-changed@main"
4242
with:
4343
files: .nais/test/klass-solr.yaml
44-
main-branch-name: 'nais-migration' #TODO: Remove when we change branch back to main
4544

4645
- name: Check for Prod manifest changes
4746
id: prod-manifest-changed
4847
uses: "nais/what-changed@main"
4948
with:
5049
files: .nais/prod/klass-solr.yaml
51-
main-branch-name: 'nais-migration' #TODO: Remove when we change branch back to main
5250

5351
deploy-test:
5452
name: Deploy to Test

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ jobs:
2323

2424
# Build all modules except klass-forvaltning since it is not compatible with JDK 17
2525
- name: Publish to GitHub Packages
26-
run: mvn --batch-mode deploy -pl '!:klass-forvaltning' -DskipTests
26+
run: mvn --batch-mode deploy -DskipTests
2727
env:
2828
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/tests.yml‎

Lines changed: 38 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,36 @@
11
name: Tests
22
run-name: "Build, run tests, package and deploy"
3+
permissions:
4+
contents: read
5+
packages: read
36

47
on:
58
push:
69
branches:
7-
- master
10+
- main
811
pull_request:
912
paths-ignore:
1013
- '**.md'
1114

1215
jobs:
13-
build:
14-
strategy:
15-
matrix:
16-
os: [ 'ubuntu-latest']
17-
runs-on: ${{ matrix.os }}
16+
check-code-format:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@v3
20+
with:
21+
fetch-depth: '0'
22+
- name: Set up JDK 17
23+
uses: actions/setup-java@v4
24+
with:
25+
distribution: 'temurin'
26+
java-version: '17'
27+
cache: maven
28+
29+
- name: Check code format
30+
run: mvn --batch-mode fmt:check
1831

32+
build:
33+
runs-on: ubuntu-latest
1934
steps:
2035
- uses: actions/checkout@v3
2136
- name: Set up JDK 17
@@ -25,10 +40,20 @@ jobs:
2540
java-version: '17'
2641
cache: maven
2742

28-
# Build all modules except klass-forvaltning since it is not compatible with JDK 17
29-
- name: Build, test and package with Maven
30-
run: mvn --batch-mode --update-snapshots package -pl '!:klass-forvaltning'
43+
- name: Build and test
44+
run: mvn --batch-mode --update-snapshots package
45+
46+
- name: SonarQube Cloud Scan
47+
run: mvn --batch-mode sonar:sonar
48+
env:
49+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
3150

51+
build-klass-forvaltning:
52+
runs-on: ubuntu-latest
53+
permissions:
54+
contents: read
55+
packages: read
56+
steps:
3257
- uses: actions/checkout@v3
3358
- name: Set up JDK 1.8
3459
uses: actions/setup-java@v4
@@ -38,8 +63,9 @@ jobs:
3863
cache: maven
3964

4065
# Build only klass-forvaltning with JDK 1.8
41-
- name: Build, test and package with Maven
42-
run: mvn --batch-mode --update-snapshots package -Djava.version=1.8 -pl :klass-forvaltning -am
66+
- name: Build and test Klass Forvaltning
67+
working-directory: klass-forvaltning
68+
run: mvn --batch-mode --update-snapshots package -Djava.version=1.8 -am
4369
env:
4470
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4571

@@ -60,6 +86,6 @@ jobs:
6086
cache: maven
6187

6288
- name: Publish to GitHub Packages
63-
run: mvn --batch-mode deploy -pl '!:klass-forvaltning' -DskipTests
89+
run: mvn --batch-mode deploy -DskipTests
6490
env:
6591
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)