Skip to content

Commit eabc6ab

Browse files
authored
Switch to Ubuntu 24.04 in CI (npgsql#6054)
1 parent 81e9c58 commit eabc6ab

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ jobs:
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
os: [ubuntu-22.04]
31+
os: [ubuntu-24.04]
3232
pg_major: [17, 16, 15, 14, 13]
3333
config: [Release]
3434
test_tfm: [net8.0]
3535
include:
36-
- os: ubuntu-22.04
36+
- os: ubuntu-24.04
3737
pg_major: 17
3838
config: Debug
3939
test_tfm: net8.0
@@ -45,7 +45,7 @@ jobs:
4545
pg_major: 17
4646
config: Release
4747
test_tfm: net8.0
48-
# - os: ubuntu-22.04
48+
# - os: ubuntu-24.04
4949
# pg_major: 17
5050
# config: Release
5151
# test_tfm: net8.0
@@ -80,10 +80,9 @@ jobs:
8080
# First uninstall any PostgreSQL installed on the image
8181
dpkg-query -W --showformat='${Package}\n' 'postgresql-*' | xargs sudo dpkg -P postgresql
8282
83-
# Import the repository signing key
84-
wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
85-
86-
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'
83+
# Automated repository configuration
84+
sudo apt install -y postgresql-common
85+
sudo /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y
8786
sudo apt-get update -qq
8887
sudo apt-get install -qq postgresql-${{ matrix.pg_major }}
8988
export PGDATA=/etc/postgresql/${{ matrix.pg_major }}/main
@@ -333,7 +332,7 @@ jobs:
333332
334333
publish-ci:
335334
needs: build
336-
runs-on: ubuntu-22.04
335+
runs-on: ubuntu-24.04
337336
if: github.event_name == 'push' && github.repository == 'npgsql/npgsql'
338337
environment: myget
339338

@@ -373,7 +372,7 @@ jobs:
373372

374373
release:
375374
needs: build
376-
runs-on: ubuntu-22.04
375+
runs-on: ubuntu-24.04
377376
if: github.event_name == 'push' && startsWith(github.repository, 'npgsql/') && needs.build.outputs.is_release == 'true'
378377
environment: nuget.org
379378

.github/workflows/native-aot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
strategy:
8888
fail-fast: false
8989
matrix:
90-
os: [ ubuntu-22.04 ]
90+
os: [ ubuntu-24.04 ]
9191
pg_major: [ 15 ]
9292
tfm: [ net8.0 ]
9393

@@ -121,7 +121,7 @@ jobs:
121121
strategy:
122122
fail-fast: false
123123
matrix:
124-
os: [ubuntu-22.04]
124+
os: [ubuntu-24.04]
125125
pg_major: [15]
126126
tfm: [ net8.0 ]
127127

.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)