From: Greg Hudson <ghudson@mit.edu>
Date: Mon, 3 Apr 2023 20:00:37 +0000 (-0400)
Subject: Run Github Actions on ubuntu-latest (not 18.04)
X-Git-Tag: krb5-1.21-beta1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d848af28e84e6eac5aa16cd10157ef4b2cf58a84;p=thirdparty%2Fkrb5.git

Run Github Actions on ubuntu-latest (not 18.04)

The ubuntu-18.04 image no longer works on Github Actions.  Run most
jobs on ubuntu-latest instead.

libresolv-wrapper does not work on ubuntu-22.04 at this time
(Launchpad bug #2015570), so don't install it for now.  The URI
discovery tests will be skipped until this is rectified.

For the doc build, move doc-newest-sphix to ubuntu-latest; the Ubuntu
version doesn't matter much for this build as it downloads sphinx from
pypi.org.  Move the doc-older-sphinx to ubuntu-22.04 (currently the
same as ubuntu-latest), skipping ubuntu-20.04 as its version of
doxygen (1.18.17) doesn't correctly the type declaration for
krb5_const_principal.
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e7a58485ac..68a4788adb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,17 +14,17 @@ jobs:
                 name: [linux-clang, linux-clang-openssl, linux-gcc]
                 include:
                     - name: linux-clang
-                      os: ubuntu-18.04
+                      os: ubuntu-latest
                       compiler: clang
                       makevars: CPPFLAGS=-Werror
                       configureopts: --enable-asan
                     - name: linux-clang-openssl
-                      os: ubuntu-18.04
+                      os: ubuntu-latest
                       compiler: clang
                       makevars: CPPFLAGS=-Werror
                       configureopts: --with-crypto-impl=openssl
                     - name: linux-gcc
-                      os: ubuntu-18.04
+                      os: ubuntu-latest
                       compiler: gcc
         steps:
             - name: Checkout repository
@@ -33,7 +33,7 @@ jobs:
               if: startsWith(matrix.os, 'ubuntu')
               run: |
                 sudo apt-get update -qq
-                sudo apt-get install -y bison gettext keyutils ldap-utils libcmocka-dev libldap2-dev libkeyutils-dev libresolv-wrapper libsasl2-dev libssl-dev python3-kdcproxy python3-pip slapd tcsh
+                sudo apt-get install -y bison gettext keyutils ldap-utils libcmocka-dev libldap2-dev libkeyutils-dev libsasl2-dev libssl-dev python3-kdcproxy python3-pip slapd tcsh
                 pip3 install pyrad
             - name: Build
               env:
diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml
index 75f467cde7..f7f6b6b09f 100644
--- a/.github/workflows/doc.yml
+++ b/.github/workflows/doc.yml
@@ -6,21 +6,21 @@ on:
 
 jobs:
     doc-older-sphinx:
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-22.04
         steps:
             - name: Checkout repository
               uses: actions/checkout@v1
             - name: Linux setup
               run: |
                 sudo apt-get update -qq
-                sudo apt-get install -y doxygen python3-lxml python3-pip python-sphinx
+                sudo apt-get install -y doxygen python3-lxml python3-pip python3-sphinx
                 pip3 install Cheetah3
             - name: Build documentation
               run: |
                 cd src/doc
                 make -f Makefile.in SPHINX_ARGS=-W htmlsrc
     doc-newest-sphinx:
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-latest
         steps:
             - name: Checkout repository
               uses: actions/checkout@v1