.builds: upgrade debian image to fix a wine compatibility issue

See https://groups.google.com/g/golang-nuts/c/Msg1USaNaqM

Also disable the Apple builder, it no longer builds.

Signed-off-by: Elias Naur <mail@eliasnaur.com>

.builds/apple.yml

@@ -8,8 +8,10 @@ packages:
  - libxml2-dev
  - libssl-dev
  - libz-dev
+ - ninja-build # cctools
  - llvm-dev # for cctools
- - uuid-dev ## for cctools
+ - uuid-dev # for cctools
+ - libblocksruntime-dev # for cctools
  - libplist-utils # for gogio
 sources:
  - https://git.sr.ht/~eliasnaur/gio-cmd
@@ -17,6 +19,7 @@ sources:
  - https://git.sr.ht/~eliasnaur/giouiorg
  - https://github.com/tpoechtrager/cctools-port.git
  - https://github.com/tpoechtrager/apple-libtapi.git
+ - https://github.com/tpoechtrager/apple-libdispatch
  - https://github.com/mackyle/xar.git
 environment:
    APPLE_TOOLCHAIN_ROOT: /home/build/appletools
@@ -42,6 +45,11 @@ tasks:
  - install_appletoolchain: |
      cd giouiorg
      go build -o $APPLE_TOOLCHAIN_ROOT/tools ./cmd/appletoolchain
+ - build_libdispatch: |
+     cd apple-libdispatch
+     cmake -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_INSTALL_PREFIX=$APPLE_TOOLCHAIN_ROOT/libdispatch .
+     ninja
+     ninja install
  - build_xar: |
      cd xar/xar
      ac_cv_lib_crypto_OpenSSL_add_all_ciphers=yes CC=clang ./autogen.sh --prefix=/usr
@@ -53,15 +61,16 @@ tasks:
      ./install.sh
  - build_cctools: |
      cd cctools-port/cctools
-     ./configure --prefix $APPLE_TOOLCHAIN_ROOT/toolchain --with-libtapi=$APPLE_TOOLCHAIN_ROOT/libtapi --target=x86_64-apple-darwin19
+     ./configure --prefix $APPLE_TOOLCHAIN_ROOT/toolchain --with-libtapi=$APPLE_TOOLCHAIN_ROOT/libtapi --with-libdispatch=$APPLE_TOOLCHAIN_ROOT/libdispatch --target=x86_64-apple-darwin19
      make install
  - install_gogio: |
      cd gio-cmd
      go install ./gogio
- - test_ios_gogio: |
-     mkdir tmp
-     cd tmp
-     go mod init example.com
-     go get -d gioui.org/example/kitchen
-     export PATH=/home/build/appletools/bin:$PATH
-     gogio -target ios -o app.app gioui.org/example/kitchen
+ # Broken test.
+ # - test_ios_gogio: |
+ #     mkdir tmp
+ #     cd tmp
+ #     go mod init example.com
+ #     go get -d gioui.org/example/kitchen
+ #     export PATH=/home/build/appletools/bin:$PATH
+ #     gogio -target ios -o app.app gioui.org/example/kitchen

.builds/linux.yml

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: Unlicense OR MIT
-image: debian/bookworm
+image: debian/testing
 packages:
  - curl
  - pkg-config
@@ -56,8 +56,8 @@ tasks:
      # mirror to github
      ssh-keyscan github.com > "$HOME"/.ssh/known_hosts && cd gio-cmd && git push --mirror "$github_mirror" || echo "failed mirroring"
  - install_chrome: |
-     curl -s https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
-     sudo sh -c 'echo "deb [arch=amd64] https://dl-ssl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
+     sudo curl -o /etc/apt/keyrings/google.pub -s https://dl.google.com/linux/linux_signing_key.pub
+     sudo sh -c 'echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/google.pub] https://dl-ssl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
      sudo apt-get -qq update
      sudo apt-get -qq install -y google-chrome-stable
  - test: |