~eliasnaur/gio-patches

.builds: switch to Go 1.14rc1 release downloads v1 PROPOSED

Daniel Martí: 1
 .builds: switch to Go 1.14rc1 release downloads

 3 files changed, 17 insertions(+), 25 deletions(-)
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git:

curl -s https://lists.sr.ht/~eliasnaur/gio-patches/patches/9752/mbox | git am -3
Learn more about email & git

[PATCH] .builds: switch to Go 1.14rc1 release downloads Export this patch

On Linux and FreeBSD, this means we no longer need to install Go twice,
since we don't need to bootstrap a Go build. This reduces the "install
go" step by over half a minute, and avoids installing a number of distro
packages.

Debian requires the pkg-config package to be explicit, as it's not part
of the build-essential metapackage, and we need it. It was being pulled
as a dependency from the golang package before.

OpenBSD is nearly the same change, modulo the fact that Go doesn't have
a binary release for it. So instead, we keep installing Go via the
system's package, and we download and build a source archive.

Finally, switch from Debian testing+experimental to simply unstable.
Sway 1.4 finally hit unstable a few days ago, and experimental is
extremely unstable, so this is a step in the right direction. Add a TODO
about going to just testing once sway 1.4 arrives there.

Signed-off-by: Daniel Martí <mvdan@mvdan.cc>
---
 .builds/freebsd.yml | 11 ++++-------
 .builds/linux.yml   | 19 +++++++------------
 .builds/openbsd.yml | 12 ++++++------
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index 9a5a374..d028f17 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -5,17 +5,14 @@ packages:
 - wayland
 - mesa-libs
 - xorg-vfbserver
 - go
sources:
 - https://git.sr.ht/~eliasnaur/gio
environment:
    PATH: /home/build/bin:/bin:/usr/local/bin:/usr/bin
 PATH: /home/build/sdk/go/bin:/bin:/usr/local/bin:/usr/bin
tasks:
 - install_gotip: |
     go get golang.org/dl/gotip
     /home/build/go/bin/gotip download
     mkdir /home/build/bin
     ln -s /home/build/go/bin/gotip /home/build/bin/go
 - install_go1_14rc1: |
     mkdir -p /home/build/sdk
     curl https://dl.google.com/go/go1.14rc1.freebsd-amd64.tar.gz | tar -C /home/build/sdk -xzf -
 - test_gio: |
     cd gio
     go test ./...
diff --git a/.builds/linux.yml b/.builds/linux.yml
index 2dc9a4e..4d25802 100644
--- a/.builds/linux.yml
+++ b/.builds/linux.yml
@@ -1,8 +1,7 @@
image: debian/testing
repositories:
 experimental: http://deb.debian.org/debian experimental main
image: debian/unstable # TODO(mvdan): switch back to testing once sway hits that repo
packages:
 - curl
 - pkg-config
 - libwayland-dev
 - libx11-dev
 - libx11-xcb-dev
@@ -16,24 +15,20 @@ packages:
 - libxi-dev
 - libxxf86vm-dev
 - wine
 - golang
 - xvfb
 - xdotool
 - scrot
 # - sway TODO: uncomment once the wayland e2e test passes again
 - grim
sources:
 - https://git.sr.ht/~eliasnaur/gio
environment:
 GOFLAGS: -mod=readonly
 PATH: /home/build/bin:/usr/bin
 PATH: /home/build/sdk/go/bin:/usr/bin
tasks:
 - maybe_install_sway: |
     sudo apt-get install sway || true
 - install_gotip: |
     go get golang.org/dl/gotip
     /home/build/go/bin/gotip download
     mkdir /home/build/bin
     ln -s /home/build/go/bin/gotip /home/build/bin/go
 - install_go1_14rc1: |
     mkdir -p /home/build/sdk
     curl https://dl.google.com/go/go1.14rc1.linux-amd64.tar.gz | tar -C /home/build/sdk -xzf -
 - install_chrome: |
     curl -s https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
     sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
diff --git a/.builds/openbsd.yml b/.builds/openbsd.yml
index d4d28ee..b36294f 100644
--- a/.builds/openbsd.yml
+++ b/.builds/openbsd.yml
@@ -5,13 +5,13 @@ packages:
sources:
 - https://git.sr.ht/~eliasnaur/gio
environment:
    PATH: /home/build/bin:/bin:/usr/local/bin:/usr/bin
 PATH: /home/build/sdk/go/bin:/bin:/usr/local/bin:/usr/bin
tasks:
 - install_gotip: |
     go get golang.org/dl/gotip
     /home/build/go/bin/gotip download
     mkdir /home/build/bin
     ln -s /home/build/go/bin/gotip /home/build/bin/go
 - install_go1_14rc1: |
     mkdir -p /home/build/sdk
     curl https://dl.google.com/go/go1.14rc1.src.tar.gz | tar -C /home/build/sdk -xzf -
     cd /home/build/sdk/go/src
     ./make.bash
 - test_gio: |
     cd gio
     go test ./...
-- 
2.25.0
Thanks, applied.
View this thread in the archives