Skip to content

Commit 2cce977

Browse files
authored
devops: stop publishing Ubuntu 20.04 (#1690)
1 parent 20b13ad commit 2cce977

File tree

5 files changed

+9
-75
lines changed

5 files changed

+9
-75
lines changed

.github/workflows/test_docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
flavor: [focal, jammy, noble]
27+
flavor: [jammy, noble]
2828
steps:
2929
- uses: actions/checkout@v3
3030
- name: Build Docker image

.github/workflows/trigger_internal_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
trigger:
1111
name: "trigger"
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-24.04
1313
steps:
1414
- run: |
1515
curl -X POST \

utils/docker/Dockerfile.focal

Lines changed: 0 additions & 53 deletions
This file was deleted.

utils/docker/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ set -e
33
set +x
44

55
if [[ ($1 == '--help') || ($1 == '-h') || ($1 == '') || ($2 == '') ]]; then
6-
echo "usage: $(basename $0) {--arm64,--amd64} {focal,jammy} playwright:localbuild-focal"
6+
echo "usage: $(basename $0) {--arm64,--amd64} {jammy,noble} playwright:localbuild-noble"
77
echo
8-
echo "Build Playwright docker image and tag it as 'playwright:localbuild-focal'."
8+
echo "Build Playwright docker image and tag it as 'playwright:localbuild-noble'."
99
echo "Once image is built, you can run it with"
1010
echo ""
11-
echo " docker run --rm -it playwright:localbuild-focal /bin/bash"
11+
echo " docker run --rm -it playwright:localbuild-noble /bin/bash"
1212
echo ""
1313
echo "NOTE: this requires on Playwright PIP dependencies to be installed"
1414
echo ""

utils/docker/publish_docker.sh

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ else
2727
exit 1
2828
fi
2929

30-
# Ubuntu 20.04
31-
FOCAL_TAGS=(
32-
"v${PW_VERSION}-focal"
33-
)
34-
3530
# Ubuntu 22.04
3631
JAMMY_TAGS=(
3732
"v${PW_VERSION}-jammy"
@@ -75,14 +70,12 @@ install_oras_if_needed() {
7570
publish_docker_images_with_arch_suffix() {
7671
local FLAVOR="$1"
7772
local TAGS=()
78-
if [[ "$FLAVOR" == "focal" ]]; then
79-
TAGS=("${FOCAL_TAGS[@]}")
80-
elif [[ "$FLAVOR" == "jammy" ]]; then
73+
if [[ "$FLAVOR" == "jammy" ]]; then
8174
TAGS=("${JAMMY_TAGS[@]}")
8275
elif [[ "$FLAVOR" == "noble" ]]; then
8376
TAGS=("${NOBLE_TAGS[@]}")
8477
else
85-
echo "ERROR: unknown flavor - $FLAVOR. Must be either 'focal', 'jammy', or 'noble'"
78+
echo "ERROR: unknown flavor - $FLAVOR. Must be either 'jammy', or 'noble'"
8679
exit 1
8780
fi
8881
local ARCH="$2"
@@ -103,14 +96,12 @@ publish_docker_images_with_arch_suffix() {
10396
publish_docker_manifest () {
10497
local FLAVOR="$1"
10598
local TAGS=()
106-
if [[ "$FLAVOR" == "focal" ]]; then
107-
TAGS=("${FOCAL_TAGS[@]}")
108-
elif [[ "$FLAVOR" == "jammy" ]]; then
99+
if [[ "$FLAVOR" == "jammy" ]]; then
109100
TAGS=("${JAMMY_TAGS[@]}")
110101
elif [[ "$FLAVOR" == "noble" ]]; then
111102
TAGS=("${NOBLE_TAGS[@]}")
112103
else
113-
echo "ERROR: unknown flavor - $FLAVOR. Must be either 'focal', 'jammy', 'noble'"
104+
echo "ERROR: unknown flavor - $FLAVOR. Must be either 'jammy', 'noble'"
114105
exit 1
115106
fi
116107

@@ -129,10 +120,6 @@ publish_docker_manifest () {
129120
done
130121
}
131122

132-
publish_docker_images_with_arch_suffix focal amd64
133-
publish_docker_images_with_arch_suffix focal arm64
134-
publish_docker_manifest focal amd64 arm64
135-
136123
publish_docker_images_with_arch_suffix jammy amd64
137124
publish_docker_images_with_arch_suffix jammy arm64
138125
publish_docker_manifest jammy amd64 arm64

0 commit comments

Comments
 (0)