Skip to content

Commit

Permalink
Merge pull request #1133 from buildpacks/i386_build_fix
Browse files Browse the repository at this point in the history
update ppa release by pinning go version to enable building for i386 arch
  • Loading branch information
jromero authored Apr 13, 2021
2 parents acbd243 + bfe8114 commit b5c1a96
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/deliver-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,15 @@ jobs:
- target: xenial
runner: ubuntu-16.04
image: docker://ubuntu:16.04
i386-go-version: 1.13
- target: bionic
runner: ubuntu-18.04
image: docker://ubuntu:18.04
i386-go-version: 1.15
- target: focal
runner: ubuntu-20.04
image: docker://ubuntu:20.04
i386-go-version: none
name: create-ppa
runs-on: ${{ matrix.runner }}

Expand Down Expand Up @@ -71,6 +74,7 @@ jobs:
tokenSuffix: '}}'
env:
ARCH: "any"
I386_GO_VERSION: ${{matrix.i386-go-version}}
PACKAGE_NAME: "pack-cli"
UBUNTU_VERSION: ${{ matrix.target }}
HOMEPAGE: "https://buildpacks.io"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/delivery/ubuntu/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: {{PACKAGE_NAME}}
Section: utils
Priority: optional
Maintainer: {{MAINTAINER_NAME}} <{{MAINTAINER_EMAIL}}>
Build-Depends: debhelper (>=9), git, golang (>=1.13)
Build-Depends: debhelper (>=9), git, golang (>=1.13) [!i386], golang-{{I386_GO_VERSION}} [i386]
Standards-Version: 3.9.8
Vcs-Git: [email protected]/{{REPO}}.git
Vcs-Browser: https://github.com/{{REPO}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/delivery/ubuntu/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ override_dh_auto_test:

override_dh_auto_build:
mkdir -p /tmp/.cache/go-build
GOCACHE=/tmp/.cache/go-build GOFLAGS="-mod=vendor" LDFLAGS="" PACK_VERSION='{{PACK_VERSION}}' dh_auto_build -- build
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
rm -r /tmp/.cache/go-build


Expand Down

0 comments on commit b5c1a96

Please sign in to comment.