Skip to content

Commit 3e8ccdb

Browse files
authored
Build deb in docker (#8126)
This allows us to build on Ubuntu 20.04 a little longer.
1 parent 585319f commit 3e8ccdb

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
id: build
3030
env:
3131
GO_VERSION: ${{ matrix.GO_VERSION }}
32-
run: ./tools/make-assets.sh
32+
run: docker run -v $PWD:/boulder -e GO_VERSION=$GO_VERSION -e COMMIT_ID="$(git rev-parse --short=8 HEAD)" ubuntu:20.04 bash -c 'apt update && apt -y install gnupg2 curl sudo git gcc && cd /boulder/ && ./tools/make-assets.sh'
3333

3434
- name: Compute checksums
3535
id: checksums

.github/workflows/try-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
id: build
2828
env:
2929
GO_VERSION: ${{ matrix.GO_VERSION }}
30-
run: ./tools/make-assets.sh
30+
run: docker run -v $PWD:/boulder -e GO_VERSION=$GO_VERSION -e COMMIT_ID="$(git rev-parse --short=8 HEAD)" ubuntu:20.04 bash -c 'apt update && apt -y install gnupg2 curl sudo git gcc && cd /boulder/ && ./tools/make-assets.sh'
3131

3232
- name: Compute checksums
3333
id: checksums

tools/make-assets.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,16 @@ export PATH=/usr/local/go/bin:$PATH
2424
#
2525
# Build
2626
#
27+
LDFLAGS="-X \"github.com/letsencrypt/boulder/core.BuildID=${COMMIT_ID}\" -X \"github.com/letsencrypt/boulder/core.BuildTime=$(date -u)\" -X \"github.com/letsencrypt/boulder/core.BuildHost=$(whoami)@$(hostname)\""
28+
GOBIN=$PWD/bin/ GO111MODULE=on go install -mod=vendor -buildvcs=false -ldflags "${LDFLAGS}" ./...
2729

2830
# Set $VERSION to be a simulacrum of what is set in other build environments.
2931
VERSION="${GO_VERSION}.$(date +%s)"
3032

31-
# Build Boulder.
32-
make
33-
34-
# Produce a .deb and .tar.gz in $PWD without using `make` or `fpm`. The
35-
# resulting files will be named `boulder-newpkg-*`. Eventually this code
36-
# will be used to produce the regular `boulder-*` packages.
3733
BOULDER="${PWD}"
3834
BUILD="$(mktemp -d)"
3935
TARGET="${BUILD}/opt/boulder"
4036

41-
COMMIT_ID="$(git rev-parse --short=8 HEAD)"
42-
4337
mkdir -p "${TARGET}/bin"
4438
for NAME in admin boulder ceremony ct-test-srv pardot-test-srv chall-test-srv ; do
4539
cp -a "bin/${NAME}" "${TARGET}/bin/"

0 commit comments

Comments
 (0)