Skip to content

Commit 048a13c

Browse files
pzeballospzeballos
authored
Merge branch 'main' into Ola-DocChange-ECIS
2 parents d5ee72c + da22d7b commit 048a13c

17 files changed

+431
-37
lines changed

‎.buildkite/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3'
22

33
services:
44
fixperms-tests:
5-
image: golang:1.23
5+
image: golang:1.24
66
working_dir: /code
77
environment:
88
CGO_ENABLED: 0
@@ -11,7 +11,7 @@ services:
1111
command: go test -v ./...
1212

1313
ruby:
14-
image: ruby:3.3
14+
image: ruby:3.4
1515
working_dir: /work
1616
environment:
1717
- DRY_RUN

‎.buildkite/pipeline.cleanamis.yaml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,14 @@ steps:
2929
- "me-south-1"
3030
- "sa-east-1"
3131
plugins:
32-
- aws-assume-role-with-web-identity#v1.1.0:
32+
- aws-assume-role-with-web-identity#v1.4.0:
3333
role-arn: arn:aws:iam::172840064832:role/pipeline-buildkite-elastic-stack-for-aws-ami-cleaner
34-
- docker-compose#v5.4.1:
34+
session-tags:
35+
- organization_slug
36+
- organization_id
37+
- pipeline_slug
38+
- branch_build
39+
- docker-compose#v5.10.0:
3540
run: ruby
3641
config: .buildkite/docker-compose.yml
3742
propagate-aws-auth-tokens: true

‎.buildkite/pipeline.yaml‎

Lines changed: 71 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ steps:
2929
agents:
3030
queue: "${BUILDKITE_AGENT_META_DATA_QUEUE}"
3131
plugins:
32-
- docker-compose#v2.1.0:
32+
- docker-compose#v5.10.0:
3333
run: fixperms-tests
3434
config: .buildkite/docker-compose.yml
3535

@@ -44,8 +44,12 @@ steps:
4444
- "cfn-lint"
4545
- "fixperms-tests"
4646
plugins:
47-
- aws-assume-role-with-web-identity#v1.1.0:
47+
- aws-assume-role-with-web-identity#v1.4.0:
4848
role-arn: arn:aws:iam::172840064832:role/pipeline-buildkite-aws-stack-buildkite-aws-stack
49+
session-tags:
50+
- organization_slug
51+
- organization_id
52+
- pipeline_slug
4953

5054
- id: "packer-windows-amd64"
5155
name: ":packer: :windows:"
@@ -60,8 +64,12 @@ steps:
6064
- "cfn-lint"
6165
- "fixperms-tests"
6266
plugins:
63-
- aws-assume-role-with-web-identity#v1.1.0:
67+
- aws-assume-role-with-web-identity#v1.4.0:
6468
role-arn: arn:aws:iam::172840064832:role/pipeline-buildkite-aws-stack-buildkite-aws-stack
69+
session-tags:
70+
- organization_slug
71+
- organization_id
72+
- pipeline_slug
6573

6674
- id: "launch-windows-amd64"
6775
name: ":cloudformation: :windows: AMD64 Launch"
@@ -73,8 +81,12 @@ steps:
7381
- "packer-windows-amd64"
7482
- "deploy-service-role-stack"
7583
plugins:
76-
- aws-assume-role-with-web-identity#v1.1.0:
84+
- aws-assume-role-with-web-identity#v1.4.0:
7785
role-arn: arn:aws:iam::172840064832:role/pipeline-buildkite-aws-stack-buildkite-aws-stack
86+
session-tags:
87+
- organization_slug
88+
- organization_id
89+
- pipeline_slug
7890

7991
- id: "test-windows-amd64"
8092
name: ":cloudformation: :windows: AMD64 Test"
@@ -98,8 +110,12 @@ steps:
98110
depends_on:
99111
- "test-windows-amd64"
100112
plugins:
101-
- aws-assume-role-with-web-identity#v1.1.0:
113+
- aws-assume-role-with-web-identity#v1.4.0:
102114
role-arn: arn:aws:iam::172840064832:role/pipeline-buildkite-aws-stack-buildkite-aws-stack
115+
session-tags:
116+
- organization_slug
117+
- organization_id
118+
- pipeline_slug
103119

104120
- id: "packer-linux-amd64"
105121
name: ":packer: :linux: AMD64"
@@ -114,8 +130,12 @@ steps:
114130
- "cfn-lint"
115131
- "fixperms-tests"
116132
plugins:
117-
- aws-assume-role-with-web-identity#v1.1.0:
133+
- aws-assume-role-with-web-identity#v1.4.0:
118134
role-arn: arn:aws:iam::172840064832:role/pipeline-buildkite-aws-stack-buildkite-aws-stack
135+
session-tags:
136+
- organization_slug
137+
- organization_id
138+
- pipeline_slug
119139

120140
- id: "launch-linux-amd64"
121141
name: ":cloudformation: :linux: AMD64 Launch"
@@ -127,8 +147,12 @@ steps:
127147
- "packer-linux-amd64"
128148
- "deploy-service-role-stack"
129149
plugins:
130-
- aws-assume-role-with-web-identity#v1.1.0:
150+
- aws-assume-role-with-web-identity#v1.4.0:
131151
role-arn: arn:aws:iam::172840064832:role/pipeline-buildkite-aws-stack-buildkite-aws-stack
152+
session-tags:
153+
- organization_slug
154+
- organization_id
155+
- pipeline_slug
132156

133157
- id: "test-linux-amd64"
134158
name: ":cloudformation: :linux: AMD64 Test"
@@ -151,8 +175,12 @@ steps:
151175
depends_on:
152176
- "test-linux-amd64"
153177
plugins:
154-
- aws-assume-role-with-web-identity#v1.1.0:
178+
- aws-assume-role-with-web-identity#v1.4.0:
155179
role-arn: arn:aws:iam::172840064832:role/pipeline-buildkite-aws-stack-buildkite-aws-stack
180+
session-tags:
181+
- organization_slug
182+
- organization_id
183+
- pipeline_slug
156184

157185
- id: "packer-linux-arm64"
158186
name: ":packer: :linux: ARM64"
@@ -167,8 +195,12 @@ steps:
167195
- "cfn-lint"
168196
- "fixperms-tests"
169197
plugins:
170-
- aws-assume-role-with-web-identity#v1.1.0:
198+
- aws-assume-role-with-web-identity#v1.4.0:
171199
role-arn: arn:aws:iam::172840064832:role/pipeline-buildkite-aws-stack-buildkite-aws-stack
200+
session-tags:
201+
- organization_slug
202+
- organization_id
203+
- pipeline_slug
172204

173205
- id: "launch-linux-arm64"
174206
name: ":cloudformation: :linux: ARM64 Launch"
@@ -180,8 +212,12 @@ steps:
180212
- "packer-linux-arm64"
181213
- "deploy-service-role-stack"
182214
plugins:
183-
- aws-assume-role-with-web-identity#v1.1.0:
215+
- aws-assume-role-with-web-identity#v1.4.0:
184216
role-arn: arn:aws:iam::172840064832:role/pipeline-buildkite-aws-stack-buildkite-aws-stack
217+
session-tags:
218+
- organization_slug
219+
- organization_id
220+
- pipeline_slug
185221

186222
- id: "test-linux-arm64"
187223
name: ":cloudformation: :linux: ARM64 Test"
@@ -204,8 +240,12 @@ steps:
204240
depends_on:
205241
- "test-linux-arm64"
206242
plugins:
207-
- aws-assume-role-with-web-identity#v1.1.0:
243+
- aws-assume-role-with-web-identity#v1.4.0:
208244
role-arn: arn:aws:iam::172840064832:role/pipeline-buildkite-aws-stack-buildkite-aws-stack
245+
session-tags:
246+
- organization_slug
247+
- organization_id
248+
- pipeline_slug
209249

210250
- id: "delete-service-role-stack"
211251
name: ":aws-iam: :cloudformation: Delete"
@@ -217,8 +257,12 @@ steps:
217257
- "delete-linux-amd64"
218258
- "delete-linux-arm64"
219259
plugins:
220-
- aws-assume-role-with-web-identity#v1.1.0:
260+
- aws-assume-role-with-web-identity#v1.4.0:
221261
role-arn: arn:aws:iam::172840064832:role/pipeline-buildkite-aws-stack-buildkite-aws-stack
262+
session-tags:
263+
- organization_slug
264+
- organization_id
265+
- pipeline_slug
222266

223267
- id: "copy-ami"
224268
name: ":cloudformation: 🚚 🌎"
@@ -231,8 +275,12 @@ steps:
231275
- "test-linux-arm64"
232276
- "test-windows-amd64"
233277
plugins:
234-
- aws-assume-role-with-web-identity#v1.1.0:
278+
- aws-assume-role-with-web-identity#v1.4.0:
235279
role-arn: arn:aws:iam::172840064832:role/pipeline-buildkite-aws-stack-buildkite-aws-stack
280+
session-tags:
281+
- organization_slug
282+
- organization_id
283+
- pipeline_slug
236284

237285
- id: "publish"
238286
name: ":cloudformation: :rocket:"
@@ -245,8 +293,12 @@ steps:
245293
artifact_paths: "build/*.yml"
246294
depends_on: "copy-ami"
247295
plugins:
248-
- aws-assume-role-with-web-identity#v1.1.0:
296+
- aws-assume-role-with-web-identity#v1.4.0:
249297
role-arn: arn:aws:iam::172840064832:role/pipeline-buildkite-aws-stack-buildkite-aws-stack
298+
session-tags:
299+
- organization_slug
300+
- organization_id
301+
- pipeline_slug
250302

251303
- id: cleanup
252304
name: ":broom: Cleanup"
@@ -255,5 +307,9 @@ steps:
255307
queue: "${BUILDKITE_AGENT_META_DATA_QUEUE}"
256308
depends_on: "publish"
257309
plugins:
258-
- aws-assume-role-with-web-identity#v1.1.0:
310+
- aws-assume-role-with-web-identity#v1.4.0:
259311
role-arn: arn:aws:iam::172840064832:role/pipeline-buildkite-aws-stack-buildkite-aws-stack
312+
session-tags:
313+
- organization_slug
314+
- organization_id
315+
- pipeline_slug

‎.buildkite/scripts/generate-changelog.sh‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#!/bin/bash
2+
set -euo pipefail
3+
4+
if [[ -z "${1:-}" ]]; then
5+
echo "Usage: $0 <VERSION>"
6+
echo "Example: $0 v5.5.0"
7+
exit 1
8+
fi
9+
10+
RELEASE_VERSION=$1
11+
12+
# 1. Get the previous release tag, excluding the current release version
13+
PREVIOUS_TAG=$(git describe --tags --abbrev=0 --match='v*' --exclude="$RELEASE_VERSION")
14+
15+
# 2. Generate the changelog with ghch
16+
echo "--- Generating changelog from ${PREVIOUS_TAG} to ${RELEASE_VERSION}"
17+
CHANGELOG_BODY=$(ghch --format=markdown --from="$PREVIOUS_TAG" --next-version="$RELEASE_VERSION")
18+
19+
# 3. Check for Buildkite Agent updates
20+
AGENT_INSTALL_SCRIPT_LINUX="packer/linux/scripts/install-buildkite-agent.sh"
21+
AGENT_INSTALL_SCRIPT_WINDOWS="packer/windows/scripts/install-buildkite-agent.ps1"
22+
23+
if git diff --name-only "$PREVIOUS_TAG..HEAD" -- "$AGENT_INSTALL_SCRIPT_LINUX" "$AGENT_INSTALL_SCRIPT_WINDOWS" | grep -q "."; then
24+
echo "--- Buildkite Agent version has changed. Fetching agent release notes."
25+
AGENT_VERSION=$(grep "AGENT_VERSION=" "$AGENT_INSTALL_SCRIPT_LINUX" | cut -d'=' -f2)
26+
AGENT_RELEASE_NOTES=$(gh release view "v${AGENT_VERSION}" --repo "buildkite/agent" --json body -q .body)
27+
AGENT_CHANGELOG_DETAILS="<details>\n <summary><h3>Agent Changelog</h3></summary>\n\n${AGENT_RELEASE_NOTES}\n</details>"
28+
CHANGELOG_BODY+="\n\n${AGENT_CHANGELOG_DETAILS}"
29+
fi
30+
31+
# 4. Update CHANGELOG.md, preserving the header
32+
echo "--- Updating CHANGELOG.md"
33+
CHANGELOG_HEADER=$(head -n 5 CHANGELOG.md)
34+
CHANGELOG_REST=$(tail -n +6 CHANGELOG.md)
35+
36+
# Construct the new file content
37+
NEW_CHANGELOG_CONTENT="${CHANGELOG_HEADER}\n\n${CHANGELOG_BODY}\n\n${CHANGELOG_REST}"
38+
39+
echo -e "$NEW_CHANGELOG_CONTENT" >CHANGELOG.md
40+
41+
echo "CHANGELOG.md has been updated for ${RELEASE_VERSION}. Please review and create a pull request."

‎.github/workflows/linear_issue_open.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup Node.js
1616
uses: actions/setup-node@v4
1717
with:
18-
node-version: "20"
18+
node-version: "22"
1919

2020
- name: Create Linear Issue
2121
uses: actions/github-script@v7

0 commit comments

Comments
 (0)