diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml index 9a5a3748..d028f171 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 2dc9a4e0..4d25802a 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 d4d28ee5..b36294fd 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 ./...