mirror of
https://git.sr.ht/~eliasnaur/gio
synced 2026-07-04 08:55:35 +00:00
.builds: switch to Go 1.14rc1 release downloads
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>
This commit is contained in:
+4
-7
@@ -5,17 +5,14 @@ packages:
|
|||||||
- wayland
|
- wayland
|
||||||
- mesa-libs
|
- mesa-libs
|
||||||
- xorg-vfbserver
|
- xorg-vfbserver
|
||||||
- go
|
|
||||||
sources:
|
sources:
|
||||||
- https://git.sr.ht/~eliasnaur/gio
|
- https://git.sr.ht/~eliasnaur/gio
|
||||||
environment:
|
environment:
|
||||||
PATH: /home/build/bin:/bin:/usr/local/bin:/usr/bin
|
PATH: /home/build/sdk/go/bin:/bin:/usr/local/bin:/usr/bin
|
||||||
tasks:
|
tasks:
|
||||||
- install_gotip: |
|
- install_go1_14rc1: |
|
||||||
go get golang.org/dl/gotip
|
mkdir -p /home/build/sdk
|
||||||
/home/build/go/bin/gotip download
|
curl https://dl.google.com/go/go1.14rc1.freebsd-amd64.tar.gz | tar -C /home/build/sdk -xzf -
|
||||||
mkdir /home/build/bin
|
|
||||||
ln -s /home/build/go/bin/gotip /home/build/bin/go
|
|
||||||
- test_gio: |
|
- test_gio: |
|
||||||
cd gio
|
cd gio
|
||||||
go test ./...
|
go test ./...
|
||||||
|
|||||||
+7
-12
@@ -1,8 +1,7 @@
|
|||||||
image: debian/testing
|
image: debian/unstable # TODO(mvdan): switch back to testing once sway hits that repo
|
||||||
repositories:
|
|
||||||
experimental: http://deb.debian.org/debian experimental main
|
|
||||||
packages:
|
packages:
|
||||||
- curl
|
- curl
|
||||||
|
- pkg-config
|
||||||
- libwayland-dev
|
- libwayland-dev
|
||||||
- libx11-dev
|
- libx11-dev
|
||||||
- libx11-xcb-dev
|
- libx11-xcb-dev
|
||||||
@@ -16,24 +15,20 @@ packages:
|
|||||||
- libxi-dev
|
- libxi-dev
|
||||||
- libxxf86vm-dev
|
- libxxf86vm-dev
|
||||||
- wine
|
- wine
|
||||||
- golang
|
|
||||||
- xvfb
|
- xvfb
|
||||||
- xdotool
|
- xdotool
|
||||||
- scrot
|
- scrot
|
||||||
|
# - sway TODO: uncomment once the wayland e2e test passes again
|
||||||
- grim
|
- grim
|
||||||
sources:
|
sources:
|
||||||
- https://git.sr.ht/~eliasnaur/gio
|
- https://git.sr.ht/~eliasnaur/gio
|
||||||
environment:
|
environment:
|
||||||
GOFLAGS: -mod=readonly
|
GOFLAGS: -mod=readonly
|
||||||
PATH: /home/build/bin:/usr/bin
|
PATH: /home/build/sdk/go/bin:/usr/bin
|
||||||
tasks:
|
tasks:
|
||||||
- maybe_install_sway: |
|
- install_go1_14rc1: |
|
||||||
sudo apt-get install sway || true
|
mkdir -p /home/build/sdk
|
||||||
- install_gotip: |
|
curl https://dl.google.com/go/go1.14rc1.linux-amd64.tar.gz | tar -C /home/build/sdk -xzf -
|
||||||
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_chrome: |
|
- install_chrome: |
|
||||||
curl -s https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
|
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'
|
sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
|
||||||
|
|||||||
+6
-6
@@ -5,13 +5,13 @@ packages:
|
|||||||
sources:
|
sources:
|
||||||
- https://git.sr.ht/~eliasnaur/gio
|
- https://git.sr.ht/~eliasnaur/gio
|
||||||
environment:
|
environment:
|
||||||
PATH: /home/build/bin:/bin:/usr/local/bin:/usr/bin
|
PATH: /home/build/sdk/go/bin:/bin:/usr/local/bin:/usr/bin
|
||||||
tasks:
|
tasks:
|
||||||
- install_gotip: |
|
- install_go1_14rc1: |
|
||||||
go get golang.org/dl/gotip
|
mkdir -p /home/build/sdk
|
||||||
/home/build/go/bin/gotip download
|
curl https://dl.google.com/go/go1.14rc1.src.tar.gz | tar -C /home/build/sdk -xzf -
|
||||||
mkdir /home/build/bin
|
cd /home/build/sdk/go/src
|
||||||
ln -s /home/build/go/bin/gotip /home/build/bin/go
|
./make.bash
|
||||||
- test_gio: |
|
- test_gio: |
|
||||||
cd gio
|
cd gio
|
||||||
go test ./...
|
go test ./...
|
||||||
|
|||||||
Reference in New Issue
Block a user