Skip to content

Commit e781756

Browse files
authored
Switch to Ubuntu 24.04 in CI (#3503)
1 parent 93e55dd commit e781756

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
os: [ubuntu-22.04, windows-2022]
24+
os: [ubuntu-24.04, windows-2022]
2525
pg_major: [17, 16, 15, 14, 13]
2626
config: [Release]
2727
include:
28-
- os: ubuntu-22.04
28+
- os: ubuntu-24.04
2929
pg_major: 17
3030
config: Debug
31-
# - os: ubuntu-22.04
31+
# - os: ubuntu-24.04
3232
# pg_major: 17
3333
# config: Release
3434
# pg_prerelease: 'PG Prerelease'
@@ -54,10 +54,9 @@ jobs:
5454
# First uninstall any PostgreSQL installed on the image
5555
dpkg-query -W --showformat='${Package}\n' 'postgresql-*' | xargs sudo dpkg -P postgresql
5656
57-
# Import the repository signing key
58-
wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
59-
60-
sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main ${{ matrix.pg_major }}" >> /etc/apt/sources.list.d/pgdg.list'
57+
# Automated repository configuration
58+
sudo apt install -y postgresql-common
59+
sudo /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y
6160
sudo apt-get update -qq
6261
sudo apt-get install -qq postgresql-${{ matrix.pg_major }}
6362
@@ -140,7 +139,7 @@ jobs:
140139
141140
publish-ci:
142141
needs: build
143-
runs-on: ubuntu-22.04
142+
runs-on: ubuntu-24.04
144143
if: github.event_name == 'push' && startsWith(github.repository, 'npgsql/')
145144
environment: myget
146145

@@ -172,7 +171,7 @@ jobs:
172171

173172
release:
174173
needs: build
175-
runs-on: ubuntu-22.04
174+
runs-on: ubuntu-24.04
176175
if: github.event_name == 'push' && startsWith(github.repository, 'npgsql/') && needs.build.outputs.is_release == 'true'
177176
environment: nuget.org
178177

.github/workflows/trigger-doc-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
build:
13-
runs-on: ubuntu-22.04
13+
runs-on: ubuntu-latest
1414
steps:
1515
- name: Trigger documentation build
1616
run: |

0 commit comments

Comments
 (0)