From 097a824a08a4f41a42a2e28ee126aba2bfed6a56 Mon Sep 17 00:00:00 2001 From: Ben Moskovitz Date: Mon, 23 Oct 2023 10:57:36 +1100 Subject: [PATCH 1/2] Update bump-agent-version to use gsed This means that we can use the same sed invocation on both macos and linux, but macos users will have to `brew install gsed` --- Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c81c0fef1..fa9f811e7 100644 --- a/Makefile +++ b/Makefile @@ -204,10 +204,15 @@ update-stack: build/aws-stack.yml env-STACK_NAME AGENT_VERSION ?= $(shell curl -Lfs "https://buildkite.com/agent/releases/latest?platform=linux&arch=amd64" | grep version | cut -d= -f2) +SED ?= sed +ifeq ($(shell uname), Darwin) + SED = gsed +endif + bump-agent-version: - sed -Ei "s/\[Buildkite Agent v.*\]/[Buildkite Agent v$(AGENT_VERSION)]/g" README.md - sed -Ei "s/AGENT_VERSION=.+/AGENT_VERSION=$(AGENT_VERSION)/g" packer/linux/scripts/install-buildkite-agent.sh - sed -Ei "s/\\\$$AGENT_VERSION = \".+\"/\$$AGENT_VERSION = \"$(AGENT_VERSION)\"/g" packer/windows/scripts/install-buildkite-agent.ps1 + $(SED) -Ei "s/\[Buildkite Agent v.*\]/[Buildkite Agent v$(AGENT_VERSION)]/g" README.md + $(SED) -Ei "s/AGENT_VERSION=.+/AGENT_VERSION=$(AGENT_VERSION)/g" packer/linux/scripts/install-buildkite-agent.sh + $(SED) -Ei "s/\\\$$AGENT_VERSION = \".+\"/\$$AGENT_VERSION = \"$(AGENT_VERSION)\"/g" packer/windows/scripts/install-buildkite-agent.ps1 validate: build/aws-stack.yml aws --no-cli-pager cloudformation validate-template \ From a415cbc0e48f788d02bc4e9244f81097d508dd92 Mon Sep 17 00:00:00 2001 From: Ben Moskovitz Date: Mon, 23 Oct 2023 10:57:55 +1100 Subject: [PATCH 2/2] Update agent to 3.57 --- packer/linux/scripts/install-buildkite-agent.sh | 2 +- packer/windows/scripts/install-buildkite-agent.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packer/linux/scripts/install-buildkite-agent.sh b/packer/linux/scripts/install-buildkite-agent.sh index e3ed2dedc..6d6ab342b 100755 --- a/packer/linux/scripts/install-buildkite-agent.sh +++ b/packer/linux/scripts/install-buildkite-agent.sh @@ -15,7 +15,7 @@ sudo mkdir -p /var/lib/buildkite-agent/.aws sudo cp /tmp/conf/aws/config /var/lib/buildkite-agent/.aws/config sudo chown -R buildkite-agent:buildkite-agent /var/lib/buildkite-agent/.aws -AGENT_VERSION=3.56.0 +AGENT_VERSION=3.57.0 echo "Downloading buildkite-agent v${AGENT_VERSION} stable..." sudo curl -Lsf -o /usr/bin/buildkite-agent-stable \ "https://download.buildkite.com/agent/stable/${AGENT_VERSION}/buildkite-agent-linux-${ARCH}" diff --git a/packer/windows/scripts/install-buildkite-agent.ps1 b/packer/windows/scripts/install-buildkite-agent.ps1 index 34349ec6e..0b8a5275a 100644 --- a/packer/windows/scripts/install-buildkite-agent.ps1 +++ b/packer/windows/scripts/install-buildkite-agent.ps1 @@ -1,7 +1,7 @@ # Stop script execution when a non-terminating error occurs $ErrorActionPreference = "Stop" -$AGENT_VERSION = "3.56.0" +$AGENT_VERSION = "3.57.0" Write-Output "Creating bin dir..." New-Item -ItemType directory -Path C:\buildkite-agent\bin