From cf5be91d2deeab445a2cc9631e8477ecc8447aaa Mon Sep 17 00:00:00 2001 From: chungthuang Date: Tue, 9 Jan 2024 11:33:00 +0000 Subject: [PATCH] TUN-8129: Use the same build command between branch and release builds --- build-packages-fips.sh | 1 + build-packages.sh | 2 ++ cfsetup.yaml | 20 ++++++++++++++------ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/build-packages-fips.sh b/build-packages-fips.sh index 6daec235..a7401eab 100755 --- a/build-packages-fips.sh +++ b/build-packages-fips.sh @@ -1,3 +1,4 @@ +#!/bin/bash VERSION=$(git describe --tags --always --match "[0-9][0-9][0-9][0-9].*.*") echo $VERSION diff --git a/build-packages.sh b/build-packages.sh index 8f415dd7..2264a3e5 100755 --- a/build-packages.sh +++ b/build-packages.sh @@ -1,8 +1,10 @@ +#!/bin/bash VERSION=$(git describe --tags --always --match "[0-9][0-9][0-9][0-9].*.*") echo $VERSION # Disable FIPS module in go-boring export GOEXPERIMENT=noboringcrypto +export CGO_ENABLED=0 # This controls the directory the built artifacts go into export ARTIFACT_DIR=built_artifacts/ diff --git a/cfsetup.yaml b/cfsetup.yaml index f48f35a6..707fc4a8 100644 --- a/cfsetup.yaml +++ b/cfsetup.yaml @@ -9,22 +9,30 @@ buster: &buster - *pinned_go - build-essential - gotest-to-teamcity + - fakeroot + - rubygem-fpm + - rpm + - libffi-dev + - reprepro + - createrepo pre-cache: &build_pre_cache - export GOCACHE=/cfsetup_build/.cache/go-build - go install golang.org/x/tools/cmd/goimports@latest post-cache: - - export GOOS=linux - - export GOARCH=amd64 - - make cloudflared + # TODO: TUN-8126 this is temporary to make sure packages can be built before release + - ./build-packages.sh + # Build binary for component test + - GOOS=linux GOARCH=amd64 make cloudflared build-fips: build_dir: *build_dir builddeps: *build_deps pre-cache: *build_pre_cache post-cache: - - export GOOS=linux - - export GOARCH=amd64 - - make cloudflared - export FIPS=true + # TODO: TUN-8126 this is temporary to make sure packages can be built before release + - ./build-packages-fips.sh + # Build binary for component test + - GOOS=linux GOARCH=amd64 make cloudflared cover: build_dir: *build_dir builddeps: *build_deps