Project

General

Profile

Download (2.99 KB)

Feature #695 » 0064-CI-Update-ubuntu-runners-to-ubuntu-24.04.patch

main, S3_2 - Marko Lindqvist, 06/02/2024 04:21 AM

View differences:

.github/workflows/ci.yml
shell: bash
run: ./scripts/ci-build.sh mac-meson
normal:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: check out Freeciv
uses: actions/checkout@v4.1.1
......
libsdl2-gfx-dev \
libsdl2-image-dev \
libsdl2-ttf-dev \
libmysqlclient-dev
libmysqlclient-dev \
unixodbc-dev
- name: build
shell: bash
run: ./scripts/ci-build.sh normal
dist:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: check out Freeciv
uses: actions/checkout@v4.1.1
......
shell: bash
run: ./scripts/ci-build.sh dist
meson:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: check out Freeciv
uses: actions/checkout@v4.1.1
......
shell: bash
run: ./scripts/ci-build.sh meson
clang_debug:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: check out Freeciv
uses: actions/checkout@v4.1.1
......
libsdl2-gfx-dev \
libsdl2-image-dev \
libsdl2-ttf-dev \
libmysqlclient-dev
libmysqlclient-dev \
unixodbc-dev
- name: build
shell: bash
run: ./scripts/ci-build.sh clang_debug
tcc:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: check out Freeciv
uses: actions/checkout@v4.1.1
......
liblzma-dev \
libicu-dev \
libsqlite3-dev \
libmysqlclient-dev
libmysqlclient-dev \
unixodbc-dev
- name: build
shell: bash
run: ./scripts/ci-build.sh tcc
emsdk:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: check out Freeciv
uses: actions/checkout@v4.1.1
scripts/ci-build.sh
;;
"meson")
# Minimum version to have Qt6 detection actually working
FC_MESON_VER="0.62.2"
FC_MESON_VER=""
if test "$FC_MESON_VER" != "" ; then
mkdir meson-install
cd meson-install
(1-1/2)