Skip to content

Commit 5eb0203

Browse files
committed
Merge branch 'bugfix/fix-create-dev-branch' into q/133.0
2 parents 5836d48 + 2ccefe1 commit 5eb0203

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

.github/workflows/create-dev-branch.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ jobs:
105105
# edit cron jobs
106106
- name: bump version in cron jobs
107107
run: |
108-
current=$(grep current .github/workflows/crons.yaml | sed -E "s/\s*# current=//")
109-
old=$(grep old .github/workflows/crons.yaml | sed -E "s/\s*# old=//")
108+
current=$(grep -m 1 "# current=" .github/workflows/crons.yaml | sed -E "s/.*# current=//")
109+
old=$(grep -m 1 "# old=" .github/workflows/crons.yaml | sed -E "s/.*# old=//")
110110
sed -i "s/$current/${{ env.NEW_SHORT_VERSION }}/g" .github/workflows/crons.yaml
111111
sed -i "s/$old/$current/g" .github/workflows/crons.yaml
112112
# push

.github/workflows/crons.yaml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,23 @@ jobs:
2020
crons:
2121
runs-on: ubuntu-24.04
2222
env:
23-
MAX_RETRIES: '2'
23+
MAX_RETRIES: "2"
2424
strategy:
2525
fail-fast: false
2626
matrix:
2727
include:
2828
# Daily build jobs, needed to make sure we have at least one build
2929
# on latests commits of each branch. It is especially needed because
3030
# artifacts from builds expire after 2 weeks and nightly builds fail
31-
# current=132.0
32-
- name: "Build for MetalK8s 132.0"
31+
# current=133.0
32+
- name: "Build for MetalK8s 133.0"
3333
cron: "0 22 * * 1-5"
34-
branch: "development/132.0"
34+
branch: "development/133.0"
3535
workflow: "build.yaml"
36-
# old=131.0
37-
- name: "Build for MetalK8s 131.0"
36+
# old=132.0
37+
- name: "Build for MetalK8s 132.0"
3838
cron: "0 22 * * 1-5"
39-
branch: "development/131.0"
39+
branch: "development/132.0"
4040
workflow: "build.yaml"
4141

4242
# Nightly jobs
@@ -54,16 +54,16 @@ jobs:
5454
workflow: "nightly.yaml"
5555

5656
# Nightly retry jobs
57-
# current=132.0
58-
- name: "Retry Nightly for MetalK8s 132.0"
57+
# current=133.0
58+
- name: "Retry Nightly for MetalK8s 133.0"
5959
cron: "0 6 * * 1-5"
60-
branch: "development/132.0"
60+
branch: "development/133.0"
6161
workflow: "nightly.yaml"
6262
type: "retry"
63-
# old=131.0
64-
- name: "Retry Nightly for MetalK8s 131.0"
63+
# old=132.0
64+
- name: "Retry Nightly for MetalK8s 132.0"
6565
cron: "0 6 * * 1-5"
66-
branch: "development/131.0"
66+
branch: "development/132.0"
6767
workflow: "nightly.yaml"
6868
type: "retry"
6969
steps:
@@ -84,15 +84,15 @@ jobs:
8484
with:
8585
branch: ${{ matrix.branch }}
8686
workflow: ${{ matrix.workflow }}
87-
step-name: 'Spawn cluster with Terraform'
87+
step-name: "Spawn cluster with Terraform"
8888
max-retries: ${{ env.MAX_RETRIES }}
89-
retry-mode: 'failed-only'
89+
retry-mode: "failed-only"
9090
access_token: ${{ secrets.GITHUB_TOKEN }}
9191
- name: Notify Slack on retry triggered
9292
if: matrix.type == 'retry' && steps.retry.outputs.was-retried == 'true'
9393
uses: slackapi/slack-github-action@v1
9494
with:
95-
channel-id: '#squad-metalk8s'
95+
channel-id: "#squad-metalk8s"
9696
slack-message: |
9797
Nightly retry triggered for ${{ matrix.branch }}
9898
Job: ${{ matrix.name }}
@@ -106,7 +106,7 @@ jobs:
106106
if: matrix.type == 'retry' && steps.retry.outputs.retry-count != '' && fromJSON(steps.retry.outputs.retry-count) >= fromJSON(env.MAX_RETRIES)
107107
uses: slackapi/slack-github-action@v1
108108
with:
109-
channel-id: '#squad-metalk8s'
109+
channel-id: "#squad-metalk8s"
110110
slack-message: |
111111
⚠️ MANUAL ACTION REQUIRED ⚠️
112112
Nightly for ${{ matrix.branch }} failed after ${{ steps.retry.outputs.retry-count }} retry attempts

0 commit comments

Comments
 (0)