Skip to content

Commit fed34ea

Browse files
committed
Merged main into 13_Consolidation branch
2 parents 862534a + bea7035 commit fed34ea

18 files changed

Lines changed: 321 additions & 163 deletions

File tree

.github/workflows/dependency_review.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ jobs:
1010
- name: Checkout code
1111
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1212
- name: Dependency Review
13-
uses: actions/dependency-review-action@ce3cf9537a52e8119d91fd484ab5b8a807627bf8 # v4.6.0
13+
uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # v4.7.1
1414
with:
1515
config-file: it-at-m/.github/workflow-configs/dependency_review.yaml@main

.github/workflows/release-actions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
with:
2323
fetch-depth: 0
2424
- name: Setup Node.js
25-
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
25+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
2626
with:
2727
node-version: "lts/*"
2828

action-templates/actions/action-build-docs/action.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,23 @@
11
# https://vitepress.dev/guide/deploy#github-pages
2-
name: Build docs
2+
name: "Build docs"
33

44
inputs:
55
docs-path:
6+
description: "Path to vitepress docs project"
67
required: false
78
default: "./docs"
8-
type: string
9-
description: Path to vitepress docs project
109
node-version:
10+
description: "Node version"
1111
required: false
1212
default: "22"
13-
type: string
14-
description: "Node version"
1513
build-cmd:
14+
description: "Change build command, if using vuepress"
1615
required: false
1716
default: "build"
18-
type: string
19-
description: "Change build command, if using vuepress"
2017
dist-path:
18+
description: "Vitepress output path, which should be uploaded to github pages"
2119
required: false
2220
default: ".vitepress/dist"
23-
type: string
24-
description: "Vitepress output path, which should be uploaded to github pages"
2521

2622
runs:
2723
using: "composite"
@@ -31,7 +27,7 @@ runs:
3127
with:
3228
fetch-depth: 0 # Required for vitepress lastUpdated
3329
- name: Setup Node
34-
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
30+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
3531
with:
3632
node-version: ${{ inputs.node-version }}
3733
cache: npm

action-templates/actions/action-build-image/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ runs:
3838
- name: Checkout code
3939
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4040
- name: Download a single artifact
41-
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
41+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
4242
with:
4343
name: ${{ inputs.artifact-name }}
4444
- name: Login to registry
@@ -56,7 +56,7 @@ runs:
5656
tags: ${{inputs.image-tags}}
5757
labels: ${{inputs.image-labels}}
5858
- name: Build and push image
59-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
59+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
6060
with:
6161
context: ./${{ inputs.path }}
6262
push: true

action-templates/actions/action-checkout/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: Checkout code
22
description: "A wrapper for actions/checkout with no args"
3+
34
runs:
45
using: "composite"
56
steps:

action-templates/actions/action-codeql/action.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Advanced CodeQL action
1+
name: "Advanced CodeQL action"
22
description: "Scans a repository using provided CodeQL language, buildmode and query scan set"
33

44
inputs:
@@ -17,13 +17,14 @@ inputs:
1717
required: false
1818
default: "security-and-quality"
1919
java-version:
20-
default: "21"
21-
type: string
2220
description: "Temurin JDK version to use for autobuild (only when codeql-language is java-kotlin and codeql-build is set to autobuild)"
21+
required: false
22+
default: "21"
2323
path:
2424
description: "Path to scan files in"
2525
required: false
2626
default: "."
27+
2728
runs:
2829
using: "composite"
2930
steps:
Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,40 @@
1-
name: Create GitHub release
2-
description: "Creates a GitHub release out of a Maven artifact"
1+
name: "Create GitHub Release"
2+
description: "Creates a GitHub Release of a Maven Artifact"
3+
34
inputs:
45
artifact-name:
5-
required: true
6-
type: string
76
description: "Name of the artifact to download"
8-
tag-name:
97
required: true
10-
type: string
8+
tag-name:
119
description: "Name of a tag (e.g. sps-1.0.0 or myproject-1.0.0)"
12-
artifact-path:
1310
required: true
14-
type: string
11+
artifact-path:
1512
description: "Path to the artifacts (e.g. ./target/*.jar)"
13+
required: true
14+
draft:
15+
description: "Whether it is a draft release or not"
16+
default: "false"
17+
prerelease:
18+
description: "Whether it is a prerelease or not"
19+
default: "false"
20+
generate-release-notes:
21+
description: "if release notes should be generated"
22+
default: "false"
23+
1624
runs:
1725
using: "composite"
1826
steps:
1927
- name: Download a single artifact
20-
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
28+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
2129
with:
2230
name: ${{inputs.artifact-name}}
2331
- name: Create GitHub release
2432
id: create_release
25-
uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2.2.1
33+
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
2634
with:
2735
tag_name: ${{inputs.tag-name}}
28-
draft: false
29-
prerelease: false
30-
generate_release_notes: false
36+
draft: ${{inputs.draft == 'true'}}
37+
prerelease: ${{inputs.prerelease == 'true'}}
38+
generate_release_notes: ${{inputs.generate-release-notes == 'true'}}
3139
files: |
3240
${{inputs.artifact-path}}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
name: Dependency review
1+
name: "Dependency review"
22
inputs:
33
allow-dependencies-licenses:
4+
description: "Contains a comma separated string of packages that will be excluded from license checks"
45
required: false
56
default: ""
6-
type: string
7-
description: Contains a comma separated string of packages that will be excluded from license checks.
7+
88
runs:
99
using: "composite"
1010
steps:
1111
- name: Checkout code
1212
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1313
- name: Dependency review
14-
uses: actions/dependency-review-action@ce3cf9537a52e8119d91fd484ab5b8a807627bf8 # v4.6.0
14+
uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # v4.7.1
1515
with:
1616
config-file: it-at-m/.github/workflow-configs/dependency_review.yaml@main
1717
allow-dependencies-licenses: ${{ inputs.allow-dependencies-licenses }}

action-templates/actions/action-deploy-docs/action.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
name: Deploy docs
1+
name: "Deploy docs"
2+
23
inputs:
34
artifact-name:
45
description: "The name of the artifact to deploy"
5-
default: "github-pages"
66
required: false
7-
type: string
7+
default: "github-pages"
88
deploy-branch:
9+
description: "Branch to deploy documentation from"
910
required: false
10-
type: string
1111
default: "main"
12-
description: "Branch to deploy documentation from"
12+
1313
runs:
1414
using: "composite"
1515
steps:
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: "Validate docker stack"
2+
description: "Validates a docker compose stack using its defined healthchecks"
3+
4+
inputs:
5+
max-retries:
6+
description: "Maximum number of retry attempts"
7+
required: false
8+
default: "10"
9+
retry-interval:
10+
description: "Interval between retries in seconds"
11+
required: false
12+
default: "10"
13+
compose-file-path:
14+
description: "Path to the docker compose file"
15+
required: false
16+
default: "./"
17+
compose-file-name:
18+
description: "Name of the docker compose file"
19+
required: false
20+
default: "docker-compose.yml"
21+
skip-exited:
22+
description: "Skip checking exited containers (useful for init containers)"
23+
required: false
24+
default: "false"
25+
skip-no-healthcheck:
26+
description: "Skip checking containers without health checks"
27+
required: false
28+
default: "false"
29+
30+
runs:
31+
using: "composite"
32+
steps:
33+
- name: Checkout repository
34+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
35+
- name: Start Docker Compose services
36+
run: |
37+
cd ${{ inputs.compose-file-path }}
38+
docker compose up -d
39+
shell: bash
40+
- name: Run healthcheck
41+
uses: jaracogmbh/docker-compose-health-check-action@973fbdccf7c8e396b652d3501984c8e530a9fa80 # v1.0.0
42+
with:
43+
max-retries: ${{ inputs.max-retries }}
44+
retry-interval: ${{ inputs.retry-interval }}
45+
compose-file: ${{ inputs.compose-file-path }}${{ inputs.compose-file-name }}
46+
skip-exited: ${{ inputs.skip-exited }}
47+
skip-no-healthcheck: ${{ inputs.skip-no-healthcheck }}

0 commit comments

Comments
 (0)