Skip to content

Commit

Permalink
Update Ubuntu from 22.04 to 24.04.
Browse files Browse the repository at this point in the history
  • Loading branch information
tmcgilchrist committed Dec 10, 2024
1 parent 6329358 commit 814f675
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
12 changes: 5 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
# We then upload the compiler tree as a build artifact to enable re-use in
# subsequent jobs.
build:
runs-on: 'ubuntu-latest'
runs-on: 'ubuntu-24.04'
outputs:
manual_changed: ${{ steps.manual.outputs.manual_changed }}
steps:
Expand Down Expand Up @@ -81,13 +81,13 @@ jobs:
normal:
name: ${{ matrix.name }}
needs: build
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
strategy:
matrix:
include:
- id: normal
name: normal
dependencies: texlive-latex-extra texlive-fonts-recommended hevea sass gdb lldb python3-lldb-14
dependencies: texlive-latex-extra texlive-fonts-recommended hevea sass gdb lldb
- id: debug
name: extra (debug)
- id: debug-s4096
Expand All @@ -105,8 +105,6 @@ jobs:
if: matrix.dependencies != ''
run: |
sudo apt-get update -y && sudo apt-get install -y ${{ matrix.dependencies }}
# Work around lldb on Ubuntu 22.04 issue https://github.com/llvm/llvm-project/issues/55575
sudo ln -s /usr/lib/llvm-14/lib/python3.10/dist-packages/lldb/* /usr/lib/python3/dist-packages/lldb/
- name: Run the testsuite
if: matrix.id == 'normal'
run: |
Expand Down Expand Up @@ -152,7 +150,7 @@ jobs:
matrix:
include:
- name: linux-O0
os: ubuntu-latest
os: ubuntu-24.04
config_arg: CFLAGS='-O0'
- name: macos-x86_64
os: macos-13
Expand Down Expand Up @@ -209,7 +207,7 @@ jobs:
done
i386:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
container:
image: debian:12
options: --platform linux/i386 --user root
Expand Down
4 changes: 2 additions & 2 deletions testsuite/tests/native-debugger/linux-lldb-amd64.reference
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ Breakpoint created for regex camlMeander\$c_to_ocaml*.
(lldb) create ocaml_to_c
Breakpoint created for regex ocaml_to_c.
(lldb) run
Process XXXX launched: 'XXXX' ($ARCH)
Process XXXX stopped
* thread #1, name = 'XXXX', stop reason = breakpoint 1.1
frame #0: 0x00000000000000 meander`caml_start_program
Process XXXX launched: 'XXXX' ($ARCH)
(lldb) backtrace
frame 0: meander`caml_start_program
frame 1: meander`caml_startup_common
Expand Down Expand Up @@ -75,7 +75,6 @@ frame 12: libc.so.6`__libc_start_call_main
frame 13: libc.so.6`__libc_start_main_impl
frame 14: meander`_start
(lldb) continue
This version of LLDB has no plugin for the language "assembler". Inspection of frame variables will be limited.
Process XXXX resuming
Process XXXX stopped
* thread #1, name = 'XXXX', stop reason = breakpoint 3.1
Expand All @@ -89,6 +88,7 @@ Process XXXX stopped
7 "c_to_ocaml" c_to_ocaml
8 let omain () =
(lldb) backtrace
This version of LLDB has no plugin for the language "assembler". Inspection of frame variables will be limited.
frame 0: meander`camlMeander$c_to_ocaml
frame 1: meander`caml_start_program
frame 2: meander`caml_callback_exn
Expand Down

0 comments on commit 814f675

Please sign in to comment.