Skip to content

Commit 531612a

Browse files
committed
Building Amazon Linux RPMs and a Windows executable (aws#4220)
* Remove goenv installed version of go for AL buildspecs * Add logic to retrieve AL2023 version * Install go based on AL23 version update * Use the os-release file to detect Amazon Linux version * Add AL23 ref doc and install specific go version
1 parent f82ec7f commit 531612a

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

buildspecs/pr-build.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ phases:
4747
- CSI_DRIVER_TAR="./ecs-agent/daemonimages/csidriver/tarfiles/ebs-csi-driver.tar"
4848
- ECS_AGENT_RPM="amazon-ecs-init-${AGENT_VERSION}-1.x86_64.rpm"
4949
- WINDOWS_EXE="amazon-ecs-agent.exe"
50+
- WINDOWS_EXE="amazon-ecs-agent.exe"
5051
- echo $(pwd) 2>&1 | tee -a $BUILD_LOG
5152

5253
# Path readjustment for codebuild testing with fork and setting GOPATH appropriately
@@ -66,6 +67,11 @@ phases:
6667
- make generic-rpm-integrated 2>&1 | tee -a $BUILD_LOG
6768
- make -C ./ecs-agent/daemonimages/csidriver 2>&1 | tee -a $BUILD_LOG
6869

70+
# Build Windows executable
71+
- make docker-release TARGET_OS="windows" 2>&1 | tee -a $BUILD_LOG
72+
- cp ./out/amazon-ecs-agent.exe .
73+
74+
6975
# Build Windows executable
7076
- make docker-release TARGET_OS="windows" 2>&1 | tee -a $BUILD_LOG
7177
- cp ./out/amazon-ecs-agent.exe .
@@ -80,11 +86,7 @@ phases:
8086
CSI_DRIVER_TAR="./ecs-agent/daemonimages/csidriver/tarfiles/ebs-csi-driver-arm64.tar"
8187
fi
8288
83-
<<<<<<< HEAD
8489
# List directory files to view artifacts in build log
85-
=======
86-
# List directory file to view artifacts in build log
87-
>>>>>>> 9604f8e3b (Remove duplicate go version command)
8890
- ls
8991

9092
post_build:
@@ -97,4 +99,5 @@ artifacts:
9799
- $BUILD_LOG
98100
- $CSI_DRIVER_TAR
99101
- $WINDOWS_EXE
102+
- $WINDOWS_EXE
100103
name: $CODEBUILD_RESOLVED_SOURCE_VERSION

0 commit comments

Comments
 (0)