Skip to content

Commit 3e12eb2

Browse files
Merge branch 'master' into pro-1468-contact-photos-volunteer-in-menu
2 parents fbc6c27 + 51ed082 commit 3e12eb2

File tree

401 files changed

+5652
-6958
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

401 files changed

+5652
-6958
lines changed

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

Lines changed: 34 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,13 @@ jobs:
1515
permissions:
1616
contents: read
1717
packages: write
18-
attestations: write
19-
id-token: write
2018

2119
outputs:
2220
version: ${{ steps.meta.outputs.version }}
2321

2422
steps:
2523
- name: Checkout repository
26-
uses: actions/checkout@v4
24+
uses: actions/checkout@v6
2725

2826
- name: Log in to the container registry
2927
uses: docker/login-action@v3
@@ -46,13 +44,7 @@ jobs:
4644
push: true
4745
tags: ${{ steps.meta.outputs.tags }}
4846
labels: ${{ steps.meta.outputs.labels }}
49-
50-
- name: Generate artifact attestation
51-
uses: actions/attest-build-provenance@v1
52-
with:
53-
subject-name: ghcr.io/onegov/onegov-cloud
54-
subject-digest: ${{ steps.push.outputs.digest }}
55-
push-to-registry: true
47+
provenance: false
5648

5749
test-image:
5850
needs: build-and-push-image
@@ -116,7 +108,7 @@ jobs:
116108
install-chromedriver: true
117109

118110
- name: Checkout repo
119-
uses: actions/checkout@v4
111+
uses: actions/checkout@v6
120112

121113
- name: Get branch name (merge)
122114
if: github.event_name != 'pull_request'
@@ -184,34 +176,34 @@ jobs:
184176
# TEMPORARY: Remove after upgrade to SQLAlchemy 2.0
185177
SQLALCHEMY_WARN_20: '1'
186178

187-
cleanup-images:
188-
runs-on: ubuntu-latest
189-
needs: build-and-push-image
190-
191-
steps:
192-
193-
- name: Delete unttaged images
194-
uses: seantis/delete-package-versions@main
195-
with:
196-
package-name: 'onegov-cloud'
197-
package-type: 'container'
198-
min-versions-to-keep: 0
199-
delete-only-untagged-versions: 'true'
200-
201-
- name: Delete images tagged with commit hash
202-
uses: seantis/delete-package-versions@main
203-
with:
204-
package-name: 'onegov-cloud'
205-
package-type: 'container'
206-
min-versions-to-keep: 0
207-
ignore-versions: '^(?!sha).*$'
208-
ignore-versions-include-tags: true
209-
210-
- name: Delete old images
211-
uses: seantis/delete-package-versions@main
212-
with:
213-
package-name: 'onegov-cloud'
214-
package-type: 'container'
215-
min-versions-to-keep: 20
216-
ignore-versions: '^release-.*$'
217-
ignore-versions-include-tags: true
179+
# cleanup-images:
180+
# runs-on: ubuntu-latest
181+
# needs: build-and-push-image
182+
#
183+
# steps:
184+
#
185+
# - name: Delete unttaged images
186+
# uses: seantis/delete-package-versions@main
187+
# with:
188+
# package-name: 'onegov-cloud'
189+
# package-type: 'container'
190+
# min-versions-to-keep: 0
191+
# delete-only-untagged-versions: 'true'
192+
#
193+
# - name: Delete images tagged with commit hash
194+
# uses: seantis/delete-package-versions@main
195+
# with:
196+
# package-name: 'onegov-cloud'
197+
# package-type: 'container'
198+
# min-versions-to-keep: 0
199+
# ignore-versions: '^(?!sha).*$'
200+
# ignore-versions-include-tags: true
201+
#
202+
# - name: Delete old images
203+
# uses: seantis/delete-package-versions@main
204+
# with:
205+
# package-name: 'onegov-cloud'
206+
# package-type: 'container'
207+
# min-versions-to-keep: 20
208+
# ignore-versions: '^(release-.*|master)$'
209+
# ignore-versions-include-tags: true

.github/workflows/measure-and-store-test-durations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
install-chromedriver: true
6262

6363
- name: Checkout repo
64-
uses: actions/checkout@v4
64+
uses: actions/checkout@v6
6565

6666
- name: Install dependencies
6767
run: |

.github/workflows/stubtest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
xdg-utils
5353
5454
- name: Checkout repo
55-
uses: actions/checkout@v4
55+
uses: actions/checkout@v6
5656

5757
- name: Install dependencies
5858
run: |

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
xdg-utils
6464
6565
- name: Checkout repo
66-
uses: actions/checkout@v4
66+
uses: actions/checkout@v6
6767

6868
- name: Install dependencies
6969
run: |
@@ -159,7 +159,7 @@ jobs:
159159
install-chromedriver: true
160160

161161
- name: Checkout repo
162-
uses: actions/checkout@v4
162+
uses: actions/checkout@v6
163163

164164
- name: Get branch name (merge)
165165
if: github.event_name != 'pull_request'

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ repos:
1515
exclude: .pre-commit-config.yaml
1616
- id: pt_structure
1717
- repo: https://github.com/astral-sh/ruff-pre-commit
18-
rev: v0.15.0
18+
rev: v0.15.1
1919
hooks:
2020
- id: ruff-check
2121
args: [ "--fix" ]
@@ -27,15 +27,15 @@ repos:
2727
additional_dependencies:
2828
- flake8-type-checking>=3.0.0
2929
- repo: https://github.com/thibaudcolas/pre-commit-stylelint
30-
rev: v17.1.0
30+
rev: v17.3.0
3131
hooks:
3232
- id: stylelint
3333
files: '^src/.*\.scss'
3434
additional_dependencies:
3535
- stylelint@16.19.1
3636
- stylelint-config-standard-scss@15.0.0
3737
- repo: https://github.com/pre-commit/mirrors-eslint
38-
rev: v10.0.0-rc.2
38+
rev: v10.0.0
3939
hooks:
4040
- id: eslint
4141
files: '^src/.*\.jsx?$'

0 commit comments

Comments
 (0)