Skip to content

Commit b5c1a96

Browse files
authored
Merge pull request #1133 from buildpacks/i386_build_fix
update ppa release by pinning go version to enable building for i386 arch
2 parents acbd243 + bfe8114 commit b5c1a96

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

.github/workflows/deliver-ubuntu.yml

+4
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,15 @@ jobs:
2525
- target: xenial
2626
runner: ubuntu-16.04
2727
image: docker://ubuntu:16.04
28+
i386-go-version: 1.13
2829
- target: bionic
2930
runner: ubuntu-18.04
3031
image: docker://ubuntu:18.04
32+
i386-go-version: 1.15
3133
- target: focal
3234
runner: ubuntu-20.04
3335
image: docker://ubuntu:20.04
36+
i386-go-version: none
3437
name: create-ppa
3538
runs-on: ${{ matrix.runner }}
3639

@@ -71,6 +74,7 @@ jobs:
7174
tokenSuffix: '}}'
7275
env:
7376
ARCH: "any"
77+
I386_GO_VERSION: ${{matrix.i386-go-version}}
7478
PACKAGE_NAME: "pack-cli"
7579
UBUNTU_VERSION: ${{ matrix.target }}
7680
HOMEPAGE: "https://buildpacks.io"

.github/workflows/delivery/ubuntu/debian/control

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Source: {{PACKAGE_NAME}}
22
Section: utils
33
Priority: optional
44
Maintainer: {{MAINTAINER_NAME}} <{{MAINTAINER_EMAIL}}>
5-
Build-Depends: debhelper (>=9), git, golang (>=1.13)
5+
Build-Depends: debhelper (>=9), git, golang (>=1.13) [!i386], golang-{{I386_GO_VERSION}} [i386]
66
Standards-Version: 3.9.8
77
Vcs-Git: [email protected]/{{REPO}}.git
88
Vcs-Browser: https://github.com/{{REPO}}

.github/workflows/delivery/ubuntu/debian/rules

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ override_dh_auto_test:
1010

1111
override_dh_auto_build:
1212
mkdir -p /tmp/.cache/go-build
13-
GOCACHE=/tmp/.cache/go-build GOFLAGS="-mod=vendor" LDFLAGS="" PACK_VERSION='{{PACK_VERSION}}' dh_auto_build -- build
13+
GOCACHE=/tmp/.cache/go-build GOFLAGS="-mod=vendor" LDFLAGS="" PACK_VERSION='{{PACK_VERSION}}' PATH="${PATH}:/usr/lib/go-{{I386_GO_VERSION}}/bin" dh_auto_build -- build
1414
rm -r /tmp/.cache/go-build
1515

1616

0 commit comments

Comments
 (0)