From 3fc6506ca328921781eeb92cd03d47bc9d694f74 Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Thu, 26 Sep 2024 10:16:21 -0400 Subject: [PATCH] docker, actions: Update for Ubuntu 24.04 GitHub is preparing to roll out Ubuntu 24.04 to Actions. This prepares us for that. * Update our own Docker development environment to be based on 24.04. * `svn` has been removed from the default Actions image. Install it manually where needed. --- .../gh-wp-svn-autopublish/workflows/wp-svn-autopublish.yml | 3 +++ tools/docker/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/files/gh-wp-svn-autopublish/workflows/wp-svn-autopublish.yml b/.github/files/gh-wp-svn-autopublish/workflows/wp-svn-autopublish.yml index be553cb93595c..5fd39ebc092e6 100644 --- a/.github/files/gh-wp-svn-autopublish/workflows/wp-svn-autopublish.yml +++ b/.github/files/gh-wp-svn-autopublish/workflows/wp-svn-autopublish.yml @@ -31,6 +31,9 @@ jobs: fi exit $EXIT + - name: Install svn + run: command -v svn || sudo apt-get install -y subversion + - uses: actions/checkout@v4 with: path: src diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 265c2f7ce2876..a13d07e87caa9 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 VOLUME ["/var/www/html"]