Skip to content

Commit 50f5f45

Browse files
committed
Merge branch 'main' into non-root
2 parents a6b28f6 + 61f78ec commit 50f5f45

23 files changed

+176
-113
lines changed

.commitlintrc.js

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
const Configuration = {
2+
/*
3+
* Inherit rules from conventional commits.
4+
*/
5+
extends: ["@commitlint/config-conventional"],
6+
7+
/*
8+
* Any rules defined here will override rules from parent.
9+
*/
10+
rules: {
11+
"body-leading-blank": [2, "always"], // warning -> error
12+
"body-max-line-length": [1, "always", 100], // error -> warning
13+
"footer-leading-blank": [2, "always"], // warning -> error
14+
"footer-max-length": [1, "always", 100], // error -> warning
15+
"header-max-length": [1, "always", 100], // error -> warning
16+
},
17+
};
18+
19+
export default Configuration;

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
blank_issues_enabled: false

.github/workflows/apk-check-versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
permissions: {}
1010

1111
jobs:
12-
check:
12+
apk-check-versions:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Check the versions

.github/workflows/automerge.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22
name: "Dependabot auto-merge"
33
on: pull_request
44

5-
permissions:
6-
actions: write
7-
contents: write
8-
pull-requests: write
5+
permissions: {}
96

107
jobs:
11-
dependabot:
8+
automerge:
9+
permissions:
10+
# Required to merge the PR
11+
contents: write
12+
# Required to merge the PR if it modifies a workflow
13+
actions: write
14+
# Required to approve the PR
15+
pull-requests: write
1216
runs-on: ubuntu-latest
1317
if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}
1418
steps:

.github/workflows/check-pr.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
name: "Check PR"
33
on: pull_request
44

5-
permissions:
6-
pull-requests: write
5+
permissions: {}
76

87
jobs:
9-
check:
8+
check-pr:
9+
permissions:
10+
# Required to add labels to the PR
11+
pull-requests: write
1012
runs-on: ubuntu-latest
1113
steps:
1214
- name: Check commits

.github/workflows/codeql-analysis.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
permissions: {}
1212

1313
jobs:
14-
analyze:
14+
codeql-analysis:
1515
name: Analyze (${{ matrix.language }})
1616
# Runner size impacts CodeQL analysis time. To learn more, please see:
1717
# - https://gh.io/recommended-hardware-resources-for-running-codeql
@@ -20,16 +20,12 @@ jobs:
2020
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
2121
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
2222
permissions:
23-
# required for all workflows
24-
security-events: write
25-
26-
# required to fetch internal or private CodeQL packs
27-
packages: read
28-
29-
# only required for workflows in private repositories
23+
# for github/codeql-action/init to get workflow details
3024
actions: read
25+
# for actions/checkout to fetch code
3126
contents: read
32-
27+
# for github/codeql-action/autobuild to send a status report
28+
security-events: write
3329
strategy:
3430
fail-fast: false
3531
matrix:
@@ -58,7 +54,7 @@ jobs:
5854

5955
# Initializes the CodeQL tools for scanning.
6056
- name: Initialize CodeQL
61-
uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.5
57+
uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
6258
with:
6359
languages: ${{ matrix.language }}
6460
build-mode: ${{ matrix.build-mode }}
@@ -70,6 +66,6 @@ jobs:
7066
# queries: security-extended,security-and-quality
7167

7268
- name: Perform CodeQL Analysis
73-
uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.5
69+
uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
7470
with:
7571
category: "/language:${{matrix.language}}"

.github/workflows/dependency-review.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,18 @@
22
name: "Dependency Review"
33
on: [pull_request]
44

5-
permissions:
6-
contents: read
5+
permissions: {}
76

87
jobs:
98
dependency-review:
9+
permissions:
10+
# Required to read the code
11+
contents: read
1012
runs-on: ubuntu-latest
1113
steps:
1214
- name: "Checkout Repository"
1315
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1416
with:
1517
persist-credentials: false
1618
- name: "Dependency Review"
17-
uses: actions/dependency-review-action@595b5aeba73380359d98a5e087f648dbb0edce1b # v4.7.3
19+
uses: actions/dependency-review-action@56339e523c0409420f6c2c9a2f4292bbb3c07dd3 # v4.8.0

.github/workflows/devskim.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,29 @@ on:
1313
branches: ["main"]
1414
schedule:
1515
- cron: "0 0 * * 0"
16+
workflow_dispatch:
1617

1718
permissions: {}
1819

1920
jobs:
20-
lint:
21+
devskim:
2122
name: DevSkim
2223
runs-on: ubuntu-latest
2324
permissions:
24-
actions: read
25+
# required to read the code
2526
contents: read
27+
# required to publish security findings
2628
security-events: write
2729
steps:
2830
- name: Checkout code
2931
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3032
with:
3133
persist-credentials: false
32-
3334
- name: Run DevSkim scanner
3435
uses: microsoft/DevSkim-Action@4b5047945a44163b94642a1cecc0d93a3f428cc6 # v1.0.16
35-
36-
- name: Upload DevSkim scan results to GitHub Security tab
37-
uses: github/codeql-action/upload-sarif@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.5
3836
with:
3937
should-scan-archives: true
38+
- name: Upload DevSkim scan results to GitHub Security tab
39+
uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
40+
with:
4041
sarif_file: devskim-results.sarif

.github/workflows/docker-build-push.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@ on:
88
- cron: "0 0 * * 0"
99
workflow_dispatch:
1010

11-
permissions:
12-
# Required by sigstore
13-
id-token: write
11+
permissions: {}
1412

1513
jobs:
16-
build:
14+
docker-build-push:
1715
if: ${{ ! startsWith(github.ref, 'refs/tags/') }}
16+
permissions:
17+
# Required to create a release
18+
contents: write
19+
# Required to sign the Docker image
20+
id-token: write
1821
runs-on: ubuntu-latest
1922
steps:
2023
- name: Set REPOSITORY
@@ -67,7 +70,7 @@ jobs:
6770
labels: ${{ steps.meta.outputs.labels }}
6871
- name: Install cosign
6972
if: github.ref == 'refs/heads/main'
70-
uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
73+
uses: sigstore/cosign-installer@d7543c93d881b35a8faa02e8e3605f69b7a1ce62 # v3.10.0
7174
- name: Sign the Docker image
7275
if: github.ref == 'refs/heads/main'
7376
working-directory: ${{ env.IMAGE }}
@@ -95,7 +98,7 @@ jobs:
9598
fi
9699
- name: Check if release already exists
97100
if: env.VERSION != ''
98-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
101+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
99102
id: check-release
100103
with:
101104
script: |
@@ -123,6 +126,5 @@ jobs:
123126
env:
124127
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
125128
with:
126-
name: ${{ env.VERSION }}
129+
release_name: ${{ env.VERSION }}
127130
tag_name: v${{ env.VERSION }}
128-
generate_release_notes: true

.github/workflows/docker-release.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,16 @@ on:
55
release:
66
types: [published]
77

8-
permissions:
9-
# Required by sigstore
10-
id-token: write
8+
permissions: {}
119

1210
jobs:
13-
release:
11+
docker-release:
1412
if: startsWith(github.ref, 'refs/tags/')
13+
permissions:
14+
# Required to checkout the code
15+
contents: read
16+
# Required to sign the Docker image
17+
id-token: write
1518
runs-on: ubuntu-latest
1619
steps:
1720
- name: Set REPOSITORY
@@ -59,7 +62,7 @@ jobs:
5962
tags: ${{ steps.meta.outputs.tags }}
6063
labels: ${{ steps.meta.outputs.labels }}
6164
- name: Install cosign
62-
uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
65+
uses: sigstore/cosign-installer@d7543c93d881b35a8faa02e8e3605f69b7a1ce62 # v3.10.0
6366
- name: Sign the Docker image
6467
working-directory: ${{ env.REPOSITORY }}
6568
env:
@@ -74,3 +77,12 @@ jobs:
7477
images+=("${tag}@${DIGEST}")
7578
done
7679
cosign sign --recursive --yes "${images[@]}"
80+
- name: Manually generate release note
81+
shell: bash
82+
run: |
83+
set -euo pipefail
84+
IFS=$'\n\t'
85+
echo "This failure is expected. It is a reminder to update the release notes for this newly created release."
86+
echo "To do so, go to ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/releases/latest and click on the edit button."
87+
echo "Then click on the 'Generate release notes' button and finally the 'Update release' button. Cheers!"
88+
exit 1

0 commit comments

Comments
 (0)