Skip to content

Commit 05cc76b

Browse files
committed
change OS image in github workflow to ubuntu-24.04
1 parent 342e654 commit 05cc76b

File tree

9 files changed

+207
-134
lines changed

9 files changed

+207
-134
lines changed

.github/workflows/build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
name: 'Check if generated files are up to date'
4545
# Don't use ubuntu-latest but a specific version to make the job
4646
# reproducible: to get the same tools versions (autoconf, aclocal, ...)
47-
runs-on: ubuntu-22.04
47+
runs-on: ubuntu-24.04
4848
timeout-minutes: 60
4949
needs: check_source
5050
if: needs.check_source.outputs.run_tests == 'true'
@@ -195,7 +195,7 @@ jobs:
195195

196196
build_ubuntu_ssltests:
197197
name: 'Ubuntu SSL tests with OpenSSL'
198-
runs-on: ubuntu-22.04
198+
runs-on: ubuntu-24.04
199199
timeout-minutes: 60
200200
needs: check_source
201201
if: needs.check_source.outputs.run_tests == 'true'
@@ -261,7 +261,7 @@ jobs:
261261

262262
test_hypothesis:
263263
name: "Hypothesis tests on Ubuntu"
264-
runs-on: ubuntu-22.04
264+
runs-on: ubuntu-24.04
265265
timeout-minutes: 60
266266
needs: check_source
267267
if: needs.check_source.outputs.run_tests == 'true' && needs.check_source.outputs.run_hypothesis == 'true'
@@ -375,7 +375,7 @@ jobs:
375375

376376
build_asan:
377377
name: 'Address sanitizer'
378-
runs-on: ubuntu-22.04
378+
runs-on: ubuntu-24.04
379379
timeout-minutes: 60
380380
needs: check_source
381381
if: needs.check_source.outputs.run_tests == 'true'

.github/workflows/posix-deps-apt.sh

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ apt-get -yq install \
1515
libgdbm-dev \
1616
libgdbm-compat-dev \
1717
liblzma-dev \
18-
libmpdec-dev \
1918
libncurses5-dev \
2019
libreadline6-dev \
2120
libsqlite3-dev \

.github/workflows/reusable-tsan.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
jobs:
2020
build_tsan_reusable:
2121
name: 'Thread sanitizer'
22-
runs-on: ubuntu-22.04
22+
runs-on: ubuntu-24.04
2323
timeout-minutes: 60
2424
steps:
2525
- uses: actions/checkout@v4

.github/workflows/reusable-ubuntu.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
build_ubuntu_reusable:
1515
name: 'build and test'
1616
timeout-minutes: 60
17-
runs-on: ubuntu-22.04
17+
runs-on: ubuntu-24.04
1818
env:
1919
FORCE_COLOR: 1
2020
OPENSSL_VER: 3.0.15

.github/workflows/reusable-wasi.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
build_wasi_reusable:
1010
name: 'build and test'
1111
timeout-minutes: 60
12-
runs-on: ubuntu-22.04
12+
runs-on: ubuntu-24.04
1313
env:
1414
WASMTIME_VERSION: 22.0.0
1515
WASI_SDK_VERSION: 24

Tools/build/regen-configure.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -e -x
55
# The check_generated_files job of .github/workflows/build.yml must kept in
66
# sync with this script. Use the same container image than the job so the job
77
# doesn't need to run autoreconf in a container.
8-
IMAGE="ubuntu:22.04"
8+
IMAGE="ubuntu:24.04"
99
DEPENDENCIES="autotools-dev autoconf autoconf-archive pkg-config"
1010
AUTORECONF="autoreconf -ivf -Werror"
1111

aclocal.m4

+79-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config.guess

+11-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#! /bin/sh
22
# Attempt to guess a canonical system name.
3-
# Copyright 1992-2021 Free Software Foundation, Inc.
3+
# Copyright 1992-2022 Free Software Foundation, Inc.
44

55
# shellcheck disable=SC2006,SC2268 # see below for rationale
66

7-
timestamp='2021-06-03'
7+
timestamp='2022-01-09'
88

99
# This file is free software; you can redistribute it and/or modify it
1010
# under the terms of the GNU General Public License as published by
11-
# the Free Software Foundation; either version 3 of the License, or
11+
# the Free Software Foundation, either version 3 of the License, or
1212
# (at your option) any later version.
1313
#
1414
# This program is distributed in the hope that it will be useful, but
@@ -60,7 +60,7 @@ version="\
6060
GNU config.guess ($timestamp)
6161
6262
Originally written by Per Bothner.
63-
Copyright 1992-2021 Free Software Foundation, Inc.
63+
Copyright 1992-2022 Free Software Foundation, Inc.
6464
6565
This is free software; see the source for copying conditions. There is NO
6666
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -437,7 +437,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
437437
# This test works for both compilers.
438438
if test "$CC_FOR_BUILD" != no_compiler_found; then
439439
if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
440-
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
440+
(CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \
441441
grep IS_64BIT_ARCH >/dev/null
442442
then
443443
SUN_ARCH=x86_64
@@ -929,6 +929,9 @@ EOF
929929
i*:PW*:*)
930930
GUESS=$UNAME_MACHINE-pc-pw32
931931
;;
932+
*:SerenityOS:*:*)
933+
GUESS=$UNAME_MACHINE-pc-serenity
934+
;;
932935
*:Interix*:*)
933936
case $UNAME_MACHINE in
934937
x86)
@@ -1522,6 +1525,9 @@ EOF
15221525
i*86:rdos:*:*)
15231526
GUESS=$UNAME_MACHINE-pc-rdos
15241527
;;
1528+
i*86:Fiwix:*:*)
1529+
GUESS=$UNAME_MACHINE-pc-fiwix
1530+
;;
15251531
*:AROS:*:*)
15261532
GUESS=$UNAME_MACHINE-unknown-aros
15271533
;;

0 commit comments

Comments
 (0)