Skip to content

Commit 3aaf721

Browse files
authored
Merge branch 'main' into plt-4154
2 parents cc132b1 + 7298a2c commit 3aaf721

File tree

4 files changed

+87
-3
lines changed

4 files changed

+87
-3
lines changed
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."

CHANGELOG.md

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,48 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7+
## [v6.40.8](https://github.com/buildkite/elastic-ci-stack-for-aws/compare/v6.40.7...v6.40.8) (2025-07-22)
8+
9+
### Changed
10+
* Update buildkite-agent to v3.103.0 [#1528](https://github.com/buildkite/elastic-ci-stack-for-aws/pull/1528) ([renovate[bot]](https://github.com/apps/renovate))
11+
12+
### Internal
13+
* Add script for generating changelog [#1516](https://github.com/buildkite/elastic-ci-stack-for-aws/pull/1516) ([scadu](https://github.com/scadu))
14+
* Fix Renovate placeholders references [#1525](https://github.com/buildkite/elastic-ci-stack-for-aws/pull/1525) ([scadu](https://github.com/scadu))
15+
16+
### Dependencies
17+
* chore(deps): bump golang.org/x/sys from 0.33.0 to 0.34.0 [#1523](https://github.com/buildkite/elastic-ci-stack-for-aws/pull/1523) ([dependabot[bot]](https://github.com/apps/dependabot))
18+
19+
<details>
20+
<summary><h3>Agent Changelog</h3></summary>
21+
22+
## [v3.103.0](https://github.com/buildkite/agent/tree/v3.103.0) (2025-07-22)
23+
[Full Changelog](https://github.com/buildkite/agent/compare/v3.102.2...v3.103.0)
24+
25+
### Added
26+
- Configurable kubernetes-bootstrap connection timeout [#3398](https://github.com/buildkite/agent/pull/3398) (@zhming0)
27+
28+
### Changed
29+
- Exit with a specific code when the Job being Acquired is Locked [#3403](https://github.com/buildkite/agent/pull/3403) (@CerealBoy)
30+
- Rename local -> repository hooks, global -> agent hooks [#3401](https://github.com/buildkite/agent/pull/3401) (@moskyb)
31+
- Use `BUILDKITE_PIPELINE_DEFAULT_BRANCH` as a default git diff base [#3396](https://github.com/buildkite/agent/pull/3396) (@DrJosh9000)
32+
- `apply-if-changed` now enabled by default - `if_changed` improvements [#3387](https://github.com/buildkite/agent/pull/3387) (@DrJosh9000)
33+
34+
### Internal
35+
- Update to use OIDC session tokens on AWS role assumption [#3395](https://github.com/buildkite/agent/pull/3395) (@duckalini)
36+
- Annotate with lint findings [#3404](https://github.com/buildkite/agent/pull/3404) (@DrJosh9000)
37+
- Lint fixes [#3383](https://github.com/buildkite/agent/pull/3383), [#3399](https://github.com/buildkite/agent/pull/3399) (@DrJosh9000)
38+
39+
### Dependencies
40+
- build(deps): bump the cloud-providers group with 5 updates [#3406](https://github.com/buildkite/agent/pull/3406) (@dependabot[bot])
41+
- build(deps): bump the container-images group across 6 directories with 2 updates [#3405](https://github.com/buildkite/agent/pull/3405) (@dependabot[bot])
42+
- build(deps): bump the golang-x group with 4 updates [#3391](https://github.com/buildkite/agent/pull/3391) (@dependabot[bot])
43+
- build(deps): bump google.golang.org/api from 0.240.0 to 0.241.0 in the cloud-providers group [#3389](https://github.com/buildkite/agent/pull/3389) (@dependabot[bot])
44+
- build(deps): bump the container-images group across 6 directories with 3 updates [#3390](https://github.com/buildkite/agent/pull/3390) (@dependabot[bot])
45+
- build(deps): bump gopkg.in/DataDog/dd-trace-go.v1 from 1.74.2 to 1.74.3 [#3388](https://github.com/buildkite/agent/pull/3388) (@dependabot[bot])
46+
</details>
47+
48+
749
## [v6.40.7](https://github.com/buildkite/elastic-ci-stack-for-aws/compare/v6.40.6...v6.40.7) (2025-07-11)
850

951
### Changed
@@ -561,7 +603,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
561603
### Fixed
562604
- Implement several documentation improvements to the Agent (for the Buildkite Docs). [#3043](https://github.com/buildkite/agent/pull/3043) (@gilesgas)
563605
- Allow token to be empty if graphql-token is provided [#3051](https://github.com/buildkite/agent/pull/3051) (@jordandcarter)
564-
- Fix multiline secret redaction when output with \r\n [#3050](https://github.com/buildkite/agent/pull/3050) (@DrJosh9000)
606+
- Fix multiline secret redaction when output with
607+
[#3050](https://github.com/buildkite/agent/pull/3050) (@DrJosh9000)
565608
- k8s exec: Perform liveness check of clients [#3045](https://github.com/buildkite/agent/pull/3045) (@DrJosh9000)
566609
- Fix request headers for multipart [#3042](https://github.com/buildkite/agent/pull/3042) (@DrJosh9000)
567610

packer/linux/scripts/install-buildkite-agent.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ sudo mkdir -p /var/lib/buildkite-agent/.aws
1515
sudo cp /tmp/conf/aws/config /var/lib/buildkite-agent/.aws/config
1616
sudo chown -R buildkite-agent:buildkite-agent /var/lib/buildkite-agent/.aws
1717

18-
AGENT_VERSION=3.102.2
18+
AGENT_VERSION=3.103.0
1919
echo "Downloading buildkite-agent v${AGENT_VERSION} stable..."
2020
sudo curl -Lsf -o /usr/bin/buildkite-agent-stable \
2121
"https://download.buildkite.com/agent/stable/${AGENT_VERSION}/buildkite-agent-linux-${ARCH}"

packer/windows/scripts/install-buildkite-agent.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Stop script execution when a non-terminating error occurs
22
$ErrorActionPreference = "Stop"
33

4-
$AGENT_VERSION = "3.102.2"
4+
$AGENT_VERSION = "3.103.0"
55

66
Write-Output "Creating bin dir..."
77
New-Item -ItemType directory -Path C:\buildkite-agent\bin

0 commit comments

Comments
 (0)