Skip to content

Commit 4e6d527

Browse files
authored
Merge pull request #170 from giantswarm/teams-alignment-branch
Align files
2 parents 7b88cc1 + 943bd48 commit 4e6d527

File tree

5 files changed

+56
-18
lines changed

5 files changed

+56
-18
lines changed

.github/workflows/zz_generated.create_release.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# devctl
44
#
5-
# https://github.com/giantswarm/devctl/blob/c90dd09846d2e87f1bad62d2089405b78da11a82/pkg/gen/input/workflows/internal/file/create_release.yaml.template
5+
# https://github.com/giantswarm/devctl/blob/ceb521a575ac74be0d3860de5d78b5ab447098cd/pkg/gen/input/workflows/internal/file/create_release.yaml.template
66
#
77
name: Create Release
88
on:
@@ -54,7 +54,7 @@ jobs:
5454
echo "version=${version}" >> $GITHUB_OUTPUT
5555
- name: Checkout code
5656
if: ${{ steps.get_version.outputs.version != '' }}
57-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
57+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
5858
- name: Get project.go path
5959
id: get_project_go_path
6060
if: ${{ steps.get_version.outputs.version != '' }}
@@ -103,7 +103,7 @@ jobs:
103103
tarball_binary_path: "*/src/${binary}"
104104
smoke_test: "${binary} --version"
105105
- name: Checkout code
106-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
106+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
107107
- name: Update project.go
108108
id: update_project_go
109109
env:
@@ -163,7 +163,7 @@ jobs:
163163
upload_url: ${{ steps.create_gh_release.outputs.upload_url }}
164164
steps:
165165
- name: Checkout code
166-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
166+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
167167
with:
168168
ref: ${{ github.sha }}
169169
- name: Ensure correct version in project.go
@@ -216,7 +216,7 @@ jobs:
216216
tarball_binary_path: "*/src/${binary}"
217217
smoke_test: "${binary} --version"
218218
- name: Check out the repository
219-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
219+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
220220
with:
221221
fetch-depth: 0 # Clone the whole history, not just the most recent commit.
222222
- name: Fetch all tags and branches

.github/workflows/zz_generated.create_release_pr.yaml

Lines changed: 41 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# devctl
44
#
5-
# https://github.com/giantswarm/devctl/blob/7345de0273fb431a392dc15f53961b523dba2b5e/pkg/gen/input/workflows/internal/file/create_release_pr.yaml.template
5+
# https://github.com/giantswarm/devctl/blob/ceb521a575ac74be0d3860de5d78b5ab447098cd/pkg/gen/input/workflows/internal/file/create_release_pr.yaml.template
66
#
77
name: Create Release PR
88
on:
@@ -136,12 +136,50 @@ jobs:
136136
else
137137
echo "skip=false" >> $GITHUB_OUTPUT
138138
fi
139+
prepare_release_pr:
140+
name: Prepare release PR for Backstage project
141+
runs-on: ubuntu-22.04
142+
needs:
143+
- gather_facts
144+
if: ${{ needs.gather_facts.outputs.skip != 'true' && github.repository == 'giantswarm/backstage' }}
145+
steps:
146+
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
147+
with:
148+
ref: ${{ needs.gather_facts.outputs.branch }}
149+
- uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
150+
with:
151+
node-version: '20'
152+
- uses: borales/actions-yarn@3766bb1335b98fb13c60eaf358fe20811b730a88 # v5.0.0
153+
with:
154+
cmd: install
155+
- name: Prepare release PR
156+
uses: borales/actions-yarn@3766bb1335b98fb13c60eaf358fe20811b730a88 # v5.0.0
157+
with:
158+
cmd: release
159+
env:
160+
RELEASE_VERSION: ${{ needs.gather_facts.outputs.version }}
161+
- name: Set up git identity
162+
run: |
163+
git config --local user.email "dev@giantswarm.io"
164+
git config --local user.name "taylorbot"
165+
- name: Create commit
166+
env:
167+
version: "${{ needs.gather_facts.outputs.version }}"
168+
run: |
169+
git add -A
170+
git commit -m "Prepare release v${{ env.version }}"
171+
- name: Push changes
172+
env:
173+
remote_repo: "https://${{ github.actor }}:${{ secrets.TAYLORBOT_GITHUB_ACTION }}@github.com/${{ github.repository }}.git"
174+
run: |
175+
git push "${remote_repo}" HEAD:${{ needs.gather_facts.outputs.branch }}
139176
create_release_pr:
140177
name: Create release PR
141178
runs-on: ubuntu-22.04
142179
needs:
143180
- gather_facts
144-
if: ${{ needs.gather_facts.outputs.skip != 'true' }}
181+
- prepare_release_pr
182+
if: ${{ always() && needs.gather_facts.outputs.skip != 'true' }}
145183
env:
146184
architect_flags: "--organisation ${{ github.repository_owner }} --project ${{ needs.gather_facts.outputs.repo_name }}"
147185
steps:
@@ -154,7 +192,7 @@ jobs:
154192
binary: "architect"
155193
version: "6.17.0"
156194
- name: Checkout code
157-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
195+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
158196
with:
159197
ref: ${{ needs.gather_facts.outputs.branch }}
160198
- name: Prepare release changes

.github/workflows/zz_generated.gitleaks.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# devctl
44
#
5-
# https://github.com/giantswarm/devctl/blob/1a381db95a01773e471818a4ce56ad16ad5d6111/pkg/gen/input/workflows/internal/file/gitleaks.yaml.template
5+
# https://github.com/giantswarm/devctl/blob/ceb521a575ac74be0d3860de5d78b5ab447098cd/pkg/gen/input/workflows/internal/file/gitleaks.yaml.template
66
#
77
name: gitleaks
88

@@ -12,7 +12,7 @@ jobs:
1212
gitleaks:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
15+
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
1616
with:
1717
fetch-depth: '0'
1818
- name: gitleaks-action

.github/workflows/zz_generated.run_ossf_scorecard.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# devctl
44
#
5-
# https://github.com/giantswarm/devctl/blob/de4a791c8f4841d87ea06643ed4767707b7f2ea3/pkg/gen/input/workflows/internal/file/run_ossf_scorecard.yaml.template
5+
# https://github.com/giantswarm/devctl/blob/a647e3a27e6bd1a9d25d9e35462bc62100c1cd01/pkg/gen/input/workflows/internal/file/run_ossf_scorecard.yaml.template
66
#
77

88
# This workflow uses actions that are not certified by GitHub. They are provided
@@ -40,7 +40,7 @@ jobs:
4040

4141
steps:
4242
- name: "Checkout code"
43-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
43+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
4444
with:
4545
persist-credentials: false
4646

@@ -67,14 +67,14 @@ jobs:
6767
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6868
# format to the repository Actions tab.
6969
- name: "Upload artifact"
70-
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
70+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
7171
with:
7272
name: SARIF file
7373
path: results.sarif
7474
retention-days: 5
7575

7676
# Upload the results to GitHub's code scanning dashboard.
7777
- name: "Upload to code-scanning"
78-
uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
78+
uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
7979
with:
8080
sarif_file: results.sarif

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ repos:
66

77
# format Python code with black
88
- repo: https://github.com/psf/black
9-
rev: 24.8.0
9+
rev: 24.10.0
1010
hooks:
1111
- id: black
1212
language_version: python3
@@ -27,7 +27,7 @@ repos:
2727
- id: python-check-blanket-noqa
2828
# bandit
2929
- repo: https://github.com/PyCQA/bandit
30-
rev: '1.7.9'
30+
rev: '1.7.10'
3131
hooks:
3232
- id: bandit
3333
args: [ "-c", ".bandit" ]
@@ -51,12 +51,12 @@ repos:
5151
args: [ --format=json ]
5252

5353
- repo: https://github.com/igorshubovych/markdownlint-cli
54-
rev: v0.41.0
54+
rev: v0.42.0
5555
hooks:
5656
- id: markdownlint
5757

5858
- repo: https://github.com/pre-commit/pre-commit-hooks
59-
rev: v4.6.0
59+
rev: v5.0.0
6060
hooks:
6161
- id: check-added-large-files
6262
- id: check-docstring-first

0 commit comments

Comments
 (0)