Skip to content

Commit 2e9fcd6

Browse files
committed
Don't do dist-upgrade except on rolling configurations
1 parent f96117f commit 2e9fcd6

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

.github/update-packages/ubuntu.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ APT_FLAGS=(-q -oDpkg::Use-Pty=0)
99
export DEBIAN_FRONTEND=noninteractive
1010

1111
apt-get ${APT_FLAGS[@]} update
12-
apt-get ${APT_FLAGS[@]} dist-upgrade -y
12+
13+
# Full distro upgrades are opt-in for canary/rolling CI lanes only.
14+
if [[ "${CI_DIST_UPGRADE:-0}" == "1" ]]; then
15+
apt-get ${APT_FLAGS[@]} dist-upgrade -y
16+
fi
1317

1418
exit 0

.github/workflows/linux-flavors.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@ jobs:
2626
os: ubuntu-latest
2727
docker_image: ubuntu
2828
docker_tag: jammy
29+
ci_dist_upgrade: 0
2930
- build: ubuntu-noble
3031
os: ubuntu-latest
3132
docker_image: ubuntu
3233
docker_tag: noble
34+
ci_dist_upgrade: 0
3335
#- build: ubuntu-latest
3436
# os: ubuntu-latest
3537
# docker_image: ubuntu
@@ -38,6 +40,7 @@ jobs:
3840
os: ubuntu-latest
3941
docker_image: ubuntu
4042
docker_tag: rolling
43+
ci_dist_upgrade: 1
4144
#- build: ubuntu-devel
4245
# os: ubuntu-latest
4346
# docker_image: ubuntu
@@ -46,14 +49,17 @@ jobs:
4649
os: ubuntu-latest
4750
docker_image: fedora
4851
docker_tag: latest
52+
ci_dist_upgrade: 0
4953
- build: archlinux-latest
5054
os: ubuntu-latest
5155
docker_image: archlinux
5256
docker_tag: latest
57+
ci_dist_upgrade: 0
5358
- build: alpine-latest
5459
os: ubuntu-latest
5560
docker_image: alpine
5661
docker_tag: latest
62+
ci_dist_upgrade: 0
5763
steps:
5864
- uses: actions/checkout@main
5965
- name: Launch container
@@ -63,7 +69,7 @@ jobs:
6369
docker exec -e CI_BUILD=1 -e IMAGE=${{ matrix.docker_image }} -e IMAGE_TAG=${{ matrix.docker_tag }} -t github-docker-builder sh .github/preinstall.sh
6470
- name: Update packages
6571
run: |
66-
docker exec -e CI_BUILD=1 -e IMAGE=${{ matrix.docker_image }} -e IMAGE_TAG=${{ matrix.docker_tag }} -t github-docker-builder bash .github/update-packages.sh
72+
docker exec -e CI_BUILD=1 -e IMAGE=${{ matrix.docker_image }} -e IMAGE_TAG=${{ matrix.docker_tag }} -e CI_DIST_UPGRADE=${{ matrix.ci_dist_upgrade }} -t github-docker-builder bash .github/update-packages.sh
6773
- name: Install dependencies
6874
run: |
6975
docker exec -e CI_BUILD=1 -e IMAGE=${{ matrix.docker_image }} -e IMAGE_TAG=${{ matrix.docker_tag }} -t github-docker-builder bash .github/install.sh

0 commit comments

Comments
 (0)