Skip to content

Commit 429064e

Browse files
architectbotactions-usererkanerol
authored
Align files (#129)
Co-authored-by: github-actions <[email protected]> Co-authored-by: Erkan Erol <[email protected]>
1 parent 2dd9995 commit 429064e

12 files changed

+141
-41
lines changed

‎.github/workflows/zz_generated.add-team-labels.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
-O artifacts/users.yaml \
1717
https://raw.githubusercontent.com/giantswarm/github/main/tools/issue-automation/user-mapping.yaml
1818
- name: Upload Artifact
19-
uses: actions/upload-artifact@v3
19+
uses: actions/upload-artifact@v4
2020
with:
2121
name: users
2222
path: artifacts/users.yaml
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ubuntu-latest
2828
needs: build_user_list
2929
steps:
30-
- uses: actions/download-artifact@v3
30+
- uses: actions/download-artifact@v4
3131
id: download-users
3232
with:
3333
name: users

‎.github/workflows/zz_generated.add-to-project-board.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
-O artifacts/users.yaml \
1919
https://raw.githubusercontent.com/giantswarm/github/main/tools/issue-automation/user-mapping.yaml
2020
- name: Upload Artifact
21-
uses: actions/upload-artifact@v3
21+
uses: actions/upload-artifact@v4
2222
with:
2323
name: users
2424
path: artifacts/users.yaml
@@ -30,7 +30,7 @@ jobs:
3030
-O artifacts/labels.yaml \
3131
https://raw.githubusercontent.com/giantswarm/github/main/tools/issue-automation/label-mapping.yaml
3232
- name: Upload Artifact
33-
uses: actions/upload-artifact@v3
33+
uses: actions/upload-artifact@v4
3434
with:
3535
name: labels
3636
path: artifacts/labels.yaml
@@ -42,7 +42,7 @@ jobs:
4242
needs: build_user_list
4343
if: github.event.action == 'assigned'
4444
steps:
45-
- uses: actions/download-artifact@v3
45+
- uses: actions/download-artifact@v4
4646
id: download-users
4747
with:
4848
name: users
@@ -68,7 +68,7 @@ jobs:
6868
needs: build_user_list
6969
if: github.event.action == 'labeled'
7070
steps:
71-
- uses: actions/download-artifact@v3
71+
- uses: actions/download-artifact@v4
7272
id: download-labels
7373
with:
7474
name: labels

‎.github/workflows/zz_generated.check_values_schema.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# DO NOT EDIT. Generated with:
22
#
3-
# [email protected]
3+
# devctl
4+
#
5+
# https://github.com/giantswarm/devctl/blob/7a2bb1c2403407b720ec16e047f804471a57209e/pkg/gen/input/workflows/internal/file/check_values_schema.yaml.template
46
#
57
name: 'Values and schema'
68
on:
@@ -21,7 +23,7 @@ jobs:
2123
runs-on: ubuntu-latest
2224
steps:
2325
- name: Checkout
24-
uses: actions/checkout@v4
26+
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
2527
with:
2628
fetch-depth: 0
2729

‎.github/workflows/zz_generated.create_release.yaml

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# DO NOT EDIT. Generated with:
22
#
3-
# [email protected]
3+
# devctl
4+
#
5+
# https://github.com/giantswarm/devctl/blob/7a2bb1c2403407b720ec16e047f804471a57209e/pkg/gen/input/workflows/internal/file/create_release.yaml.template
46
#
57
name: Create Release
68
on:
@@ -32,11 +34,10 @@ jobs:
3234
steps:
3335
- name: Get version
3436
id: get_version
37+
env:
38+
COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
3539
run: |
36-
title="$(cat <<- 'COMMIT_MESSAGE_END' | head -n 1 -
37-
${{ github.event.head_commit.message }}
38-
COMMIT_MESSAGE_END
39-
)"
40+
title=$(echo -n "${COMMIT_MESSAGE}" | head -1)
4041
# Matches strings like:
4142
#
4243
# - "Release v1.2.3"
@@ -53,7 +54,7 @@ jobs:
5354
echo "version=${version}" >> $GITHUB_OUTPUT
5455
- name: Checkout code
5556
if: ${{ steps.get_version.outputs.version != '' }}
56-
uses: actions/checkout@v4
57+
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
5758
- name: Get project.go path
5859
id: get_project_go_path
5960
if: ${{ steps.get_version.outputs.version != '' }}
@@ -66,11 +67,10 @@ jobs:
6667
echo "path=${path}" >> $GITHUB_OUTPUT
6768
- name: Check if reference version
6869
id: ref_version
70+
env:
71+
COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
6972
run: |
70-
title="$(cat <<- 'COMMIT_MESSAGE_END' | head -n 1 -
71-
${{ github.event.head_commit.message }}
72-
COMMIT_MESSAGE_END
73-
)"
73+
title=$(echo -n "${COMMIT_MESSAGE}" | head -1)
7474
if echo "${title}" | grep -qE '^release v[0-9]+\.[0-9]+\.[0-9]+([.-][^ .-][^ ]*)?( \(#[0-9]+\))?$' ; then
7575
version=$(echo "${title}" | cut -d ' ' -f 2)
7676
fi
@@ -90,20 +90,20 @@ jobs:
9090
- gather_facts
9191
steps:
9292
- name: Install architect
93-
uses: giantswarm/install-binary-action@v1.1.0
93+
uses: giantswarm/install-binary-action@033b1a657eea23d9c42e77312b370e6125e4e38f # v2.0.0
9494
with:
9595
binary: "architect"
96-
version: "6.11.0"
96+
version: "6.14.1"
9797
- name: Install semver
98-
uses: giantswarm/install-binary-action@v1.1.0
98+
uses: giantswarm/install-binary-action@033b1a657eea23d9c42e77312b370e6125e4e38f # v2.0.0
9999
with:
100100
binary: "semver"
101101
version: "3.2.0"
102102
download_url: "https://github.com/fsaintjacques/${binary}-tool/archive/${version}.tar.gz"
103103
tarball_binary_path: "*/src/${binary}"
104104
smoke_test: "${binary} --version"
105105
- name: Checkout code
106-
uses: actions/checkout@v4
106+
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
107107
- name: Update project.go
108108
id: update_project_go
109109
env:
@@ -144,6 +144,15 @@ jobs:
144144
title: "Bump version to ${{ steps.update_project_go.outputs.new_version }}"
145145
run: |
146146
gh pr create --title "${{ env.title }}" --body "" --base ${{ env.base }} --head ${{ env.branch }} --reviewer ${{ github.actor }}
147+
- name: Enable auto-merge for PR
148+
env:
149+
GITHUB_TOKEN: "${{ secrets.TAYLORBOT_GITHUB_ACTION }}"
150+
base: "${{ github.ref }}"
151+
branch: "${{ github.ref }}-version-bump"
152+
version: "${{ needs.gather_facts.outputs.version }}"
153+
title: "Bump version to ${{ steps.update_project_go.outputs.new_version }}"
154+
run: |
155+
gh pr merge --auto --squash "${{ env.branch }}" || echo "::warning::Auto-merge not allowed. Please adjust the repository settings."
147156
create_release:
148157
name: Create release
149158
runs-on: ubuntu-22.04
@@ -154,7 +163,7 @@ jobs:
154163
upload_url: ${{ steps.create_gh_release.outputs.upload_url }}
155164
steps:
156165
- name: Checkout code
157-
uses: actions/checkout@v4
166+
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
158167
with:
159168
ref: ${{ github.sha }}
160169
- name: Ensure correct version in project.go
@@ -165,7 +174,7 @@ jobs:
165174
grep -qE "version[[:space:]]*=[[:space:]]*\"$version\"" $file
166175
- name: Get Changelog Entry
167176
id: changelog_reader
168-
uses: mindsers/changelog-reader-action@v2
177+
uses: mindsers/changelog-reader-action@32aa5b4c155d76c94e4ec883a223c947b2f02656 # v2.2.3
169178
with:
170179
version: ${{ needs.gather_facts.outputs.version }}
171180
path: ./CHANGELOG.md
@@ -184,13 +193,12 @@ jobs:
184193
git push "${REMOTE_REPO}" --tags
185194
- name: Create release
186195
id: create_gh_release
187-
uses: actions/create-release@v1
196+
uses: ncipollo/release-action@2c591bcc8ecdcd2db72b97d6147f871fcd833ba5 # v1.14.0
188197
env:
189198
GITHUB_TOKEN: "${{ secrets.TAYLORBOT_GITHUB_ACTION }}"
190199
with:
191200
body: ${{ steps.changelog_reader.outputs.changes }}
192-
tag_name: "v${{ needs.gather_facts.outputs.version }}"
193-
release_name: "v${{ needs.gather_facts.outputs.version }}"
201+
tag: "v${{ needs.gather_facts.outputs.version }}"
194202

195203
create-release-branch:
196204
name: Create release branch
@@ -200,15 +208,15 @@ jobs:
200208
if: ${{ needs.gather_facts.outputs.version }}
201209
steps:
202210
- name: Install semver
203-
uses: giantswarm/install-binary-action@v1.1.0
211+
uses: giantswarm/install-binary-action@033b1a657eea23d9c42e77312b370e6125e4e38f # v2.0.0
204212
with:
205213
binary: "semver"
206214
version: "3.0.0"
207215
download_url: "https://github.com/fsaintjacques/${binary}-tool/archive/${version}.tar.gz"
208216
tarball_binary_path: "*/src/${binary}"
209217
smoke_test: "${binary} --version"
210218
- name: Check out the repository
211-
uses: actions/checkout@v4
219+
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
212220
with:
213221
fetch-depth: 0 # Clone the whole history, not just the most recent commit.
214222
- name: Fetch all tags and branches

‎.github/workflows/zz_generated.create_release_pr.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# DO NOT EDIT. Generated with:
22
#
3-
# [email protected]
3+
# devctl
4+
#
5+
# https://github.com/giantswarm/devctl/blob/7a2bb1c2403407b720ec16e047f804471a57209e/pkg/gen/input/workflows/internal/file/create_release_pr.yaml.template
46
#
57
name: Create Release PR
68
on:
@@ -143,16 +145,16 @@ jobs:
143145
env:
144146
architect_flags: "--organisation ${{ github.repository_owner }} --project ${{ needs.gather_facts.outputs.repo_name }}"
145147
steps:
146-
- uses: actions/setup-go@v3
148+
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
147149
with:
148150
go-version: '=1.18.1'
149151
- name: Install architect
150-
uses: giantswarm/install-binary-action@v1.1.0
152+
uses: giantswarm/install-binary-action@033b1a657eea23d9c42e77312b370e6125e4e38f # v2.0.0
151153
with:
152154
binary: "architect"
153155
version: "6.11.0"
154156
- name: Checkout code
155-
uses: actions/checkout@v4
157+
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
156158
with:
157159
ref: ${{ needs.gather_facts.outputs.branch }}
158160
- name: Prepare release changes

‎.github/workflows/zz_generated.gitleaks.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# DO NOT EDIT. Generated with:
22
#
3-
# [email protected]
3+
# devctl
4+
#
5+
# https://github.com/giantswarm/devctl/blob/7a2bb1c2403407b720ec16e047f804471a57209e/pkg/gen/input/workflows/internal/file/gitleaks.yaml.template
46
#
57
name: gitleaks
68

@@ -10,7 +12,7 @@ jobs:
1012
gitleaks:
1113
runs-on: ubuntu-latest
1214
steps:
13-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
1416
with:
1517
fetch-depth: '0'
1618
- name: gitleaks-action

‎.github/workflows/zz_generated.run_ossf_scorecard.yaml

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
# DO NOT EDIT. Generated with:
2+
#
3+
# devctl
4+
#
5+
# https://github.com/giantswarm/devctl/blob/7a2bb1c2403407b720ec16e047f804471a57209e/pkg/gen/input/workflows/internal/file/run_ossf_scorecard.yaml.template
6+
#
7+
8+
# This workflow uses actions that are not certified by GitHub. They are provided
9+
# by a third-party and are governed by separate terms of service, privacy
10+
# policy, and support documentation.
11+
12+
name: Scorecard supply-chain security
13+
on:
14+
# For Branch-Protection check. Only the default branch is supported. See
15+
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
16+
branch_protection_rule:
17+
# To guarantee Maintained check is occasionally updated. See
18+
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
19+
schedule:
20+
- cron: '15 15 15 * *'
21+
push:
22+
branches: [ "main", "master" ]
23+
workflow_dispatch: {}
24+
25+
# Declare default permissions as read only.
26+
permissions: read-all
27+
28+
jobs:
29+
analysis:
30+
name: Scorecard analysis
31+
runs-on: ubuntu-latest
32+
permissions:
33+
# Needed to upload the results to code-scanning dashboard.
34+
security-events: write
35+
# Needed to publish results and get a badge (see publish_results below).
36+
id-token: write
37+
# Uncomment the permissions below if installing in a private repository.
38+
# contents: read
39+
# actions: read
40+
41+
steps:
42+
- name: "Checkout code"
43+
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
44+
with:
45+
persist-credentials: false
46+
47+
- name: "Run analysis"
48+
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
49+
with:
50+
results_file: results.sarif
51+
results_format: sarif
52+
# (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
53+
# - you want to enable the Branch-Protection check on a *public* repository, or
54+
# - you are installing Scorecard on a *private* repository
55+
# To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
56+
# repo_token: ${{ secrets.SCORECARD_TOKEN }}
57+
58+
# Public repositories:
59+
# - Publish results to OpenSSF REST API for easy access by consumers
60+
# - Allows the repository to include the Scorecard badge.
61+
# - See https://github.com/ossf/scorecard-action#publishing-results.
62+
# For private repositories:
63+
# - `publish_results` will always be set to `false`, regardless
64+
# of the value entered here.
65+
publish_results: true
66+
67+
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
68+
# format to the repository Actions tab.
69+
- name: "Upload artifact"
70+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
71+
with:
72+
name: SARIF file
73+
path: results.sarif
74+
retention-days: 5
75+
76+
# Upload the results to GitHub's code scanning dashboard.
77+
- name: "Upload to code-scanning"
78+
uses: github/codeql-action/upload-sarif@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
79+
with:
80+
sarif_file: results.sarif

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright 2016 - 2023 Giant Swarm GmbH
189+
Copyright 2016 - 2024 Giant Swarm GmbH
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

‎Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# DO NOT EDIT. Generated with:
22
#
3-
# [email protected]
3+
# devctl
4+
#
5+
# https://github.com/giantswarm/devctl/blob/7a2bb1c2403407b720ec16e047f804471a57209e/pkg/gen/input/makefile/internal/file/Makefile.template
46
#
57

68
include Makefile.*.mk

‎Makefile.gen.app.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# DO NOT EDIT. Generated with:
22
#
3-
# [email protected]
3+
# devctl
4+
#
5+
# https://github.com/giantswarm/devctl/blob/7a2bb1c2403407b720ec16e047f804471a57209e/pkg/gen/input/makefile/internal/file/Makefile.gen.app.mk.template
46
#
57

68
##@ App

0 commit comments

Comments
 (0)