Skip to content

Commit f5a0ec4

Browse files
committed
ci: improve integrated workflows
1 parent 1bd6a4a commit f5a0ec4

File tree

4 files changed

+80
-28
lines changed

4 files changed

+80
-28
lines changed

.github/semantic.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@ types:
1919
- major
2020
- minor
2121
- patch
22+
- deps
2223

2324
...

.github/settings.yml

Lines changed: 72 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ repository:
1111

1212
default_branch: master
1313

14+
allow_merge_commit: false
1415
allow_squash_merge: true
15-
allow_merge_commit: true
1616
allow_rebase_merge: true
1717

1818
allow_update_branch: true
@@ -21,24 +21,77 @@ repository:
2121
enable_automated_security_fixes: true
2222
enable_vulnerability_alerts: true
2323

24-
branches:
25-
- name: master
26-
protection:
27-
required_pull_request_reviews: null
28-
required_status_checks:
29-
strict: true
30-
contexts:
31-
- docker
32-
enforce_admins: false
33-
restrictions:
34-
apps:
35-
- toolhippie
36-
- renovate
37-
users: []
38-
teams:
39-
- admins
40-
- bots
41-
- members
24+
rulesets:
25+
- name: prevent destruction
26+
target: branch
27+
enforcement: active
28+
conditions:
29+
ref_name:
30+
include:
31+
- "~DEFAULT_BRANCH"
32+
exclude: []
33+
rules:
34+
- type: required_linear_history
35+
- type: deletion
36+
- type: non_fast_forward
37+
38+
- name: check verification
39+
target: branch
40+
enforcement: active
41+
conditions:
42+
ref_name:
43+
include:
44+
- "~DEFAULT_BRANCH"
45+
exclude: []
46+
rules:
47+
- type: required_status_checks
48+
parameters:
49+
strict_required_status_checks_policy: true
50+
required_status_checks:
51+
- context: Semantic PR
52+
integration_id: 198092
53+
- context: docker
54+
integration_id: 15368
55+
bypass_actors:
56+
- actor_id: 1
57+
actor_type: OrganizationAdmin
58+
bypass_mode: always
59+
- actor_id: 951647 # app
60+
actor_type: Integration
61+
bypass_mode: always
62+
- actor_id: 6276810 # bots
63+
actor_type: Team
64+
bypass_mode: always
65+
66+
- name: require reviewing
67+
target: branch
68+
enforcement: active
69+
conditions:
70+
ref_name:
71+
include:
72+
- "~DEFAULT_BRANCH"
73+
exclude: []
74+
rules:
75+
- type: pull_request
76+
parameters:
77+
allowed_merge_methods:
78+
- squash
79+
- rebase
80+
dismiss_stale_reviews_on_push: false
81+
require_code_owner_review: false
82+
require_last_push_approval: false
83+
required_approving_review_count: 0
84+
required_review_thread_resolution: false
85+
bypass_actors:
86+
- actor_id: 1
87+
actor_type: OrganizationAdmin
88+
bypass_mode: always
89+
- actor_id: 951647 # app
90+
actor_type: Integration
91+
bypass_mode: always
92+
- actor_id: 6276810 # bots
93+
actor_type: Team
94+
bypass_mode: always
4295

4396
teams:
4497
- name: admins

.github/workflows/automerge.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
2+
# yaml-language-server: $schema=https://www.schemastore.org/github-workflow.json
23
name: automerge
34

45
"on":

.github/workflows/docker.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,19 @@ name: docker
1212
schedule:
1313
- cron: 0 8 * * 1
1414

15+
permissions:
16+
contents: write
17+
packages: write
18+
1519
jobs:
1620
docker:
1721
runs-on: ubuntu-latest
1822

1923
steps:
2024
- name: Checkout source
21-
id: source
2225
uses: actions/checkout@v5
2326

2427
- name: Detect version
25-
id: version
2628
run: |
2729
VER=$(sed -ne "s/^.*JSONNET_BUNDLER_VERSION=\(.*\)/\1/p;" Dockerfile)
2830
echo IMAGE_TAG=${VER} >> ${GITHUB_ENV}
@@ -48,23 +50,20 @@ jobs:
4850
maintainer=Thomas Boerger <thomas@webhippie.de>
4951
5052
- name: Setup QEMU
51-
id: qemu
5253
uses: docker/setup-qemu-action@v3
5354

5455
- name: Setup Buildx
5556
id: buildx
5657
uses: docker/setup-buildx-action@v3
5758

5859
- name: Hub login
59-
id: login1
6060
uses: docker/login-action@v3
6161
if: github.event_name != 'pull_request'
6262
with:
6363
username: ${{ secrets.DOCKER_USERNAME }}
6464
password: ${{ secrets.DOCKER_PASSWORD }}
6565

6666
- name: Quay login
67-
id: login2
6867
uses: docker/login-action@v3
6968
if: github.event_name != 'pull_request'
7069
with:
@@ -73,7 +72,6 @@ jobs:
7372
password: ${{ secrets.QUAY_PASSWORD }}
7473

7574
- name: Ghcr login
76-
id: login3
7775
uses: docker/login-action@v3
7876
if: github.event_name != 'pull_request'
7977
with:
@@ -82,7 +80,6 @@ jobs:
8280
password: ${{ secrets.GITHUB_TOKEN }}
8381

8482
- name: Docker build
85-
id: docker
8683
uses: docker/build-push-action@v6
8784
with:
8885
builder: ${{ steps.buildx.outputs.name }}
@@ -95,7 +92,6 @@ jobs:
9592
cache-to: type=gha,mode=max
9693

9794
- name: Hub readme
98-
id: readme1
9995
uses: actionhippie/pushrm@v1
10096
if: github.event_name != 'pull_request'
10197
with:
@@ -107,11 +103,12 @@ jobs:
107103
readme: README.md
108104

109105
- name: Quay readme
110-
id: readme2
111106
uses: actionhippie/pushrm@v1
112107
if: github.event_name != 'pull_request'
113108
with:
114109
provider: quay
115110
target: quay.io/${{ github.repository }}
116111
apikey: ${{ secrets.QUAY_APIKEY }}
117112
readme: README.md
113+
114+
...

0 commit comments

Comments
 (0)