From 18f19ba002f5ba9729702b8fc1fbbae7fa6a131d Mon Sep 17 00:00:00 2001 From: "Sean T. Allen" Date: Tue, 3 Oct 2023 23:44:24 +0000 Subject: [PATCH] Run musl CI tests using LLDB We updated our alpine version so I decided to see if we could use LLDB instead of GDB for our debugger. And yes, we can now without a hanging. I'm leaving GDB in the image for now in case we need to switch back. Closes #4176 --- .../x86-64-unknown-linux-musl-builder/Dockerfile | 1 + .github/workflows/nightlies.yml | 2 +- .github/workflows/pr.yml | 4 ++-- .github/workflows/release.yml | 2 +- .github/workflows/stress-test-runtime.yml | 16 ++++++++-------- .github/workflows/update-lib-cache.yml | 2 +- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.ci-dockerfiles/x86-64-unknown-linux-musl-builder/Dockerfile b/.ci-dockerfiles/x86-64-unknown-linux-musl-builder/Dockerfile index 95fa60dea9..a13416410d 100644 --- a/.ci-dockerfiles/x86-64-unknown-linux-musl-builder/Dockerfile +++ b/.ci-dockerfiles/x86-64-unknown-linux-musl-builder/Dockerfile @@ -17,6 +17,7 @@ RUN apk update \ curl \ py3-pip \ gdb \ + lldb \ && pip install cloudsmith-cli # add user pony in order to not run tests as root diff --git a/.github/workflows/nightlies.yml b/.github/workflows/nightlies.yml index af4b513fca..3d326f9002 100644 --- a/.github/workflows/nightlies.yml +++ b/.github/workflows/nightlies.yml @@ -20,7 +20,7 @@ jobs: name: x86-64-unknown-linux-ubuntu20.04 triple-os: linux-ubuntu20.04 triple-vendor: unknown - - image: ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:20230830 + - image: ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:20231003 name: x86-64-unknown-linux-musl triple-os: linux-musl triple-vendor: unknown diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 59eb834246..5af16a225e 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -90,9 +90,9 @@ jobs: - image: ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu22.04-builder:20230924 name: x86-64 Linux glibc debugger: lldb - - image: ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:20230830 + - image: ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:20231003 name: x86-64 Linux musl - debugger: gdb + debugger: lldb name: ${{ matrix.name }} container: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ae65660ff6..68f6bd6651 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,7 +43,7 @@ jobs: name: x86-64-unknown-linux-ubuntu20.04 triple-os: linux-ubuntu20.04 triple-vendor: unknown - - image: ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:20230830 + - image: ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:20231003 name: x86-64-unknown-linux-musl triple-os: linux-musl triple-vendor: unknown diff --git a/.github/workflows/stress-test-runtime.yml b/.github/workflows/stress-test-runtime.yml index 157dd9d8d8..f4b2946c79 100644 --- a/.github/workflows/stress-test-runtime.yml +++ b/.github/workflows/stress-test-runtime.yml @@ -28,22 +28,22 @@ jobs: name: x86-64-unknown-linux-ubuntu22.04 [cd] [debug] target: test-stress-with-cd-debug debugger: lldb - - image: ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:20230830 + - image: ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:20231003 name: x86-64-unknown-linux-musl [release] target: test-stress-release - debugger: gdb - - image: ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:20230830 + debugger: lldb + - image: ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:20231003 name: x86-64-unknown-linux-musl [debug] target: test-stress-debug - debugger: gdb - - image: ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:20230830 + debugger: lldb + - image: ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:20231003 name: x86-64-unknown-linux-musl [cd] [release] target: test-stress-with-cd-release - debugger: gdb - - image: ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:20230830 + debugger: lldb + - image: ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:20231003 name: x86-64-unknown-linux-musl [cd] [debug] target: test-stress-with-cd-debug - debugger: gdb + debugger: lldb name: ${{ matrix.name }} container: diff --git a/.github/workflows/update-lib-cache.yml b/.github/workflows/update-lib-cache.yml index fc93287294..3f89cf6f62 100644 --- a/.github/workflows/update-lib-cache.yml +++ b/.github/workflows/update-lib-cache.yml @@ -19,7 +19,7 @@ jobs: include: - image: ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu22.04-builder:20230924 - image: ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu20.04-builder:20230830 - - image: ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:20230830 + - image: ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:20231003 - image: ghcr.io/ponylang/ponyc-ci-cross-riscv64:20230830 - image: ghcr.io/ponylang/ponyc-ci-cross-arm:20230830 - image: ghcr.io/ponylang/ponyc-ci-cross-armhf:20230830