Skip to content

Commit e693ae2

Browse files
helmut-hoffer-von-ankershoffenhelmut-hoffer-von-ankershoffen
committed
chore(deps): update from template
1 parent 798438e commit e693ae2

11 files changed

Lines changed: 99 additions & 53 deletions

‎.copier-answers.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
_commit: v0.15.23
1+
_commit: v0.15.26
22
_src_path: gh:helmut-hoffer-von-ankershoffen/oe-python-template
33
attestations_enabled: true
44
author_email: helmuthva@gmail.com

‎.dockerignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,4 @@ docker-compose.yml
9393
profile.json
9494
profile.html
9595

96-
# Application specific
96+
# Application specific

‎.github/workflows/_docker-publish.yml‎

Lines changed: 82 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -36,63 +36,107 @@ jobs:
3636
- name: Log in to Docker Hub
3737
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
3838
with:
39-
username: ${{ secrets.DOCKER_IO_USERNAME }}
40-
password: ${{ secrets.DOCKER_IO_PASSWORD }}
4139

40+
username: ${{ secrets.DOCKER_USERNAME }}
41+
password: ${{ secrets.DOCKER_PASSWORD }}
4242

43-
- name: Log in to GitHub Container Registry
43+
44+
45+
- name: Log in to GitHub container registry
4446
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
4547
with:
4648
registry: ghcr.io
47-
username: ${{ github.repository_owner }}
49+
50+
username: ${{ github.actor }}
4851
password: ${{ secrets.GITHUB_TOKEN }}
4952

50-
- name: Extract metadata for Docker
51-
id: meta
52-
uses: docker/metadata-action@38b8a86137171c128513e9be0b97bc476fbffcb5 # v5.6.0
53+
54+
- name: "(all target): Extract metadata (tags, labels) for Docker"
55+
id: meta-all
56+
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
5357
with:
54-
images: |
55-
ghcr.io/helmut-hoffer-von-ankershoffen/oe-python-template-example
5658

59+
60+
images: |
5761
${{ env.DOCKER_IO_IMAGE_NAME_ALL }}
62+
ghcr.io/${{ github.repository }}
63+
64+
5865
59-
flavor: |
60-
latest=auto
61-
prefix=
62-
suffix=
6366
tags: |
64-
type=semver,pattern=v
65-
type=semver,pattern=v.
66-
type=semver,pattern=v
67+
# set latest tag for releases
68+
type=raw,value=latest
69+
# set semver tags from git tags (v1.2.3 -> 1.2.3, 1.2, 1)
70+
type=semver,pattern={{version}}
71+
type=semver,pattern={{major}}.{{minor}}
72+
type=semver,pattern={{major}}
73+
74+
75+
- name: "(slim target): Extract metadata (tags, labels) for Docker"
76+
id: meta-slim
77+
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
78+
with:
79+
80+
81+
images: |
82+
${{ env.DOCKER_IO_IMAGE_NAME_SLIM }}
83+
ghcr.io/${{ github.repository }}-slim
84+
85+
86+
87+
tags: |
88+
# set latest tag for releases
89+
type=raw,value=latest
90+
# set semver tags from git tags (v1.2.3 -> 1.2.3, 1.2, 1)
91+
type=semver,pattern={{version}}
92+
type=semver,pattern={{major}}.{{minor}}
93+
type=semver,pattern={{major}}
94+
95+
6796
68-
- name: Build and push Docker image (all)
69-
uses: docker/build-push-action@e6ef1f314e8a75f35e85dbd71ebe08d4b3005fc8 # v6.2.0
97+
- name: "(all target): Build and push Docker image"
98+
id: build-and-push-all
99+
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
70100
with:
71101
context: .
72-
push: true
73-
tags: ${{ steps.meta.outputs.tags }}
74-
labels: ${{ steps.meta.outputs.labels }}
75-
platforms: linux/amd64,linux/arm64
102+
file: ./Dockerfile
76103
target: all
77-
provenance: true
78-
cache-from: type=gha
79-
cache-to: type=gha,mode=max
104+
platforms: linux/amd64,linux/arm64
105+
push: true
106+
tags: ${{ steps.meta-all.outputs.tags }}
107+
labels: ${{ steps.meta-all.outputs.labels }}
108+
80109

81-
- name: Build and push Docker image (slim)
82-
uses: docker/build-push-action@e6ef1f314e8a75f35e85dbd71ebe08d4b3005fc8 # v6.2.0
110+
111+
- name: "(slim target): Build and push Docker image"
112+
id: build-and-push-slim
113+
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
83114
with:
84115
context: .
116+
file: ./Dockerfile
117+
target: slim
118+
platforms: linux/amd64,linux/arm64
85119
push: true
86-
tags: |
87-
ghcr.io/helmut-hoffer-von-ankershoffen/oe-python-template-example-slim:latest
88-
ghcr.io/helmut-hoffer-von-ankershoffen/oe-python-template-example-slim:${{ github.ref_name }}
120+
tags: ${{ steps.meta-slim.outputs.tags }}
121+
labels: ${{ steps.meta-slim.outputs.labels }}
89122

90-
${{ env.DOCKER_IO_IMAGE_NAME_SLIM }}:latest
91-
${{ env.DOCKER_IO_IMAGE_NAME_SLIM }}:${{ github.ref_name }}
92123

93-
labels: ${{ steps.meta.outputs.labels }}
94-
platforms: linux/amd64,linux/arm64
95-
target: slim
96-
provenance: true
97-
cache-from: type=gha
98-
cache-to: type=gha,mode=max
124+
125+
126+
127+
- name: "(all target): Generate artifact attestation"
128+
uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
129+
with:
130+
subject-name: ${{ env.DOCKER_IO_REGISTRY }}/${{ env.DOCKER_IO_IMAGE_NAME_ALL }}
131+
subject-digest: ${{ steps.build-and-push-all.outputs.digest }}
132+
push-to-registry: true
133+
134+
135+
136+
137+
- name: "(slim target): Generate artifact attestation"
138+
uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
139+
with:
140+
subject-name: ${{ env.DOCKER_IO_REGISTRY }}/${{ env.DOCKER_IO_IMAGE_NAME_SLIM }}
141+
subject-digest: ${{ steps.build-and-push-slim.outputs.digest }}
142+
push-to-registry: true

‎.github/workflows/_install_dev_tools_project.bash‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ log "Starting installation of development tools specific to OE Python Template E
1313
# Add your project specific installation commands below
1414
# sudo apt-get install --no-install-recommends -y YOUR_PACKAGE
1515

16-
log "Completed installation of development tools specific to OE Python Template Example."
16+
log "Completed installation of development tools specific to OE Python Template Example."

‎.github/workflows/_package-publish.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66

77
jobs:
88
package_publish:
9-
environment: release
109
runs-on: ubuntu-latest
1110
permissions:
1211
contents: write

‎.github/workflows/_vercel-preview.yml‎

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

77
jobs:
88
deploy-preview:
9-
if: (!contains(github.event.head_commit.message, '[skip ci]'))
9+
environment: Preview
1010
runs-on: ubuntu-latest
1111
permissions:
1212
contents: read

‎.github/workflows/_vercel-production.yml‎

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

77
jobs:
88
deploy-production:
9-
if: (!contains(github.event.head_commit.message, '[skip ci]'))
9+
environment: Production
1010
runs-on: ubuntu-latest
1111
permissions:
1212
contents: read

‎.github/workflows/ci-cd.yml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ on:
1313
types: [created]
1414

1515
jobs:
16+
1617
lint:
18+
if: (!contains(github.event.head_commit.message, '[skip ci]'))
1719
uses: ./.github/workflows/_lint.yml
1820
permissions:
1921
contents: read
@@ -22,6 +24,7 @@ jobs:
2224
secrets: inherit
2325

2426
audit:
27+
if: (!contains(github.event.head_commit.message, '[skip ci]'))
2528
uses: ./.github/workflows/_audit.yml
2629
permissions:
2730
contents: read
@@ -30,17 +33,18 @@ jobs:
3033
secrets: inherit
3134

3235
test:
36+
if: (!contains(github.event.head_commit.message, '[skip ci]'))
37+
uses: ./.github/workflows/_test.yml
3338
permissions:
3439
attestations: write
3540
contents: read
3641
id-token: write
3742
packages: write
3843
secrets: inherit
39-
uses: ./.github/workflows/_test.yml
4044

4145

4246
codeql:
43-
if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') || (github.event_name == 'pull_request' && github.base_ref == 'main'))
47+
if: (!contains(github.event.head_commit.message, '[skip ci]'))
4448
uses: ./.github/workflows/_codeql.yml
4549
permissions:
4650
actions: read
@@ -54,8 +58,8 @@ jobs:
5458

5559
needs: [lint, audit, test, codeql]
5660

57-
if: (startsWith(github.ref, 'refs/tags/v'))
5861
uses: ./.github/workflows/_package-publish.yml
62+
if: (startsWith(github.ref, 'refs/tags/v') && (!contains(github.event.head_commit.message, '[skip ci]')))
5963
permissions:
6064
contents: write
6165
packages: read
@@ -65,7 +69,7 @@ jobs:
6569

6670
needs: [lint, audit, test, codeql]
6771

68-
if: (startsWith(github.ref, 'refs/tags/v'))
72+
if: (startsWith(github.ref, 'refs/tags/v') && (!contains(github.event.head_commit.message, '[skip ci]')))
6973
uses: ./.github/workflows/_docker-publish.yml
7074
permissions:
7175
attestations: write
@@ -79,7 +83,7 @@ jobs:
7983

8084
needs: [lint, audit, test, codeql]
8185

82-
if: (!contains(github.event.head_commit.message, '[skip ci]'))
86+
if: (!(startsWith(github.ref, 'refs/tags/v') || (github.event_name == 'release')) && !contains(github.event.head_commit.message, '[skip ci]'))
8387
uses: ./.github/workflows/_vercel-preview.yml
8488
permissions:
8589
contents: read
@@ -91,7 +95,7 @@ jobs:
9195

9296
needs: [lint, audit, test, codeql]
9397

94-
if: (startsWith(github.ref, 'refs/tags/v') || github.event_name == 'release') && !contains(github.event.head_commit.message, '[skip ci]')
98+
if: ((startsWith(github.ref, 'refs/tags/v') || (github.event_name == 'release')) && (!contains(github.event.head_commit.message, '[skip ci]')))
9599
uses: ./.github/workflows/_vercel-production.yml
96100
permissions:
97101
contents: read

‎.github/workflows/test-scheduled.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@ jobs:
1111
contents: read
1212
id-token: write
1313
secrets: inherit
14-

‎ATTRIBUTIONS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12189,7 +12189,7 @@ License: LGPL-2.1-or-later
1218912189

1219012190
```
1219112191

12192-
## oe-python-template-example (0.4.13) - MIT License
12192+
## oe-python-template-example (0.4.14) - MIT License
1219312193

1219412194
🧠 Example project scaffolded and kept up to date with OE Python Template (oe-python-template).
1219512195

0 commit comments

Comments
 (0)