Skip to content

Commit f451450

Browse files
committed
.builds: upgrade debian image to fix a wine compatibility issue
See https://groups.google.com/g/golang-nuts/c/Msg1USaNaqM Signed-off-by: Elias Naur <[email protected]>
1 parent d1bccae commit f451450

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

.builds/apple.yml

+7
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@ packages:
1010
- libz-dev
1111
- llvm-dev # for cctools
1212
- uuid-dev ## for cctools
13+
- libblocksruntime-dev # for cctools
1314
- libplist-utils # for gogio
1415
sources:
1516
- https://git.sr.ht/~eliasnaur/gio-cmd
1617
- https://git.sr.ht/~eliasnaur/applesdks
1718
- https://git.sr.ht/~eliasnaur/giouiorg
1819
- https://github.com/tpoechtrager/cctools-port.git
1920
- https://github.com/tpoechtrager/apple-libtapi.git
21+
- https://github.com/tpoechtrager/apple-libdispatch
2022
- https://github.com/mackyle/xar.git
2123
environment:
2224
APPLE_TOOLCHAIN_ROOT: /home/build/appletools
@@ -42,6 +44,11 @@ tasks:
4244
- install_appletoolchain: |
4345
cd giouiorg
4446
go build -o $APPLE_TOOLCHAIN_ROOT/tools ./cmd/appletoolchain
47+
- build_libdispatch: |
48+
cd apple-libdispatch
49+
cmake -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_INSTALL_PREFIX=$APPLE_TOOLCHAIN_ROOT/libdispatch .
50+
ninja
51+
ninja install
4552
- build_xar: |
4653
cd xar/xar
4754
ac_cv_lib_crypto_OpenSSL_add_all_ciphers=yes CC=clang ./autogen.sh --prefix=/usr

.builds/linux.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: Unlicense OR MIT
2-
image: debian/bookworm
2+
image: debian/testing
33
packages:
44
- curl
55
- pkg-config
@@ -56,8 +56,8 @@ tasks:
5656
# mirror to github
5757
ssh-keyscan github.com > "$HOME"/.ssh/known_hosts && cd gio-cmd && git push --mirror "$github_mirror" || echo "failed mirroring"
5858
- install_chrome: |
59-
curl -s https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
60-
sudo sh -c 'echo "deb [arch=amd64] https://dl-ssl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
59+
sudo curl -o /etc/apt/keyrings/google.pub -s https://dl.google.com/linux/linux_signing_key.pub
60+
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'
6161
sudo apt-get -qq update
6262
sudo apt-get -qq install -y google-chrome-stable
6363
- test: |

0 commit comments

Comments
 (0)