Skip to content

Commit 5619080

Browse files
committed
workflows/docker: stop pushing to Docker Hub, remove 20.04 image
Signed-off-by: Patrick Linnane <[email protected]>
1 parent 766e574 commit 5619080

File tree

1 file changed

+2
-35
lines changed

1 file changed

+2
-35
lines changed

.github/workflows/docker.yml

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ defaults:
1919
shell: bash -xeuo pipefail {0}
2020

2121
env:
22-
# odeprecated: remove 20.04 image in Homebrew >=4.7
23-
VERSIONS: '["20.04", "22.04", "24.04"]'
22+
VERSIONS: '["22.04", "24.04"]'
2423

2524
jobs:
2625
generate-tags:
@@ -72,15 +71,11 @@ jobs:
7271
tags+=(
7372
"ghcr.io/homebrew/ubuntu${version}:${brew_version}"
7473
"ghcr.io/homebrew/ubuntu${version}:latest"
75-
"homebrew/ubuntu${version}:${brew_version}"
76-
"homebrew/ubuntu${version}:latest"
7774
)
7875
if [[ "${version}" == "22.04" ]]; then
7976
tags+=(
8077
"ghcr.io/homebrew/brew:${brew_version}"
8178
"ghcr.io/homebrew/brew:latest"
82-
"homebrew/brew:${brew_version}"
83-
"homebrew/brew:latest"
8479
)
8580
fi
8681
elif [[ "${GITHUB_EVENT_NAME}" == "push" &&
@@ -91,10 +86,6 @@ jobs:
9186
"ghcr.io/homebrew/brew:master"
9287
"ghcr.io/homebrew/ubuntu${version}:main"
9388
"ghcr.io/homebrew/ubuntu${version}:master"
94-
"homebrew/brew:main"
95-
"homebrew/brew:master"
96-
"homebrew/ubuntu${version}:main"
97-
"homebrew/ubuntu${version}:master"
9889
)
9990
fi
10091
@@ -151,13 +142,8 @@ jobs:
151142
strategy:
152143
fail-fast: false
153144
matrix:
154-
# odeprecated: remove 20.04 image in Homebrew >=4.7
155-
version: ["20.04", "22.04", "24.04"]
145+
version: ["22.04", "24.04"]
156146
arch: ["x86_64", "arm64"]
157-
exclude:
158-
# odeprecated: remove 20.04 image in Homebrew >=4.7
159-
- version: "20.04"
160-
arch: "arm64"
161147
steps:
162148
- name: Checkout
163149
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -179,11 +165,6 @@ jobs:
179165
VERSION: ${{ matrix.version }}
180166
PUSH: ${{ needs.generate-tags.outputs.push }}
181167
run: |
182-
# odeprecated: remove 20.04 image in Homebrew >=4.7
183-
if [[ "${VERSION}" == "20.04" ]]; then
184-
echo "The homebrew/ubuntu20.04 image is deprecated and will soon be retired. Use homebrew/ubuntu24.04 or homebrew/brew." > .docker-deprecate
185-
fi
186-
187168
filter="$(printf '.["%s"]' "${VERSION}")"
188169
echo "push=$(jq --raw-output "${filter}" <<<"${PUSH}")" >>"${GITHUB_OUTPUT}"
189170
@@ -210,10 +191,6 @@ jobs:
210191
echo "HOMEBREW_ARM64_TESTING=1" >> "$GITHUB_ENV"
211192
fi
212193
213-
# odeprecated: remove 20.04 in Homebrew >=4.7
214-
if [[ "${VERSION}" == "20.04" ]]; then
215-
echo "HOMEBREW_GLIBC_TESTING=1" >> "$GITHUB_ENV"
216-
fi
217194
env:
218195
VERSION: ${{ matrix.version }}
219196
ARCH: ${{ matrix.arch }}
@@ -279,12 +256,6 @@ jobs:
279256
pattern: digest-${{ matrix.version }}-*
280257
merge-multiple: true
281258

282-
- name: Log in to Docker Hub
283-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
284-
with:
285-
username: brewtestbot
286-
password: ${{ secrets.HOMEBREW_BREW_DOCKER_TOKEN }}
287-
288259
- name: Log in to GitHub Packages (BrewTestBot)
289260
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
290261
with:
@@ -305,10 +276,6 @@ jobs:
305276
done <<<"$(jq --raw-output "${filter}" <<<"${TAGS}")"
306277
307278
image_args=("ghcr.io/homebrew/ubuntu${VERSION}@sha256:$(<"${RUNNER_TEMP}/digests/${VERSION}-x86_64")")
308-
# odeprecated: remove 20.04 image in Homebrew >=4.7
309-
if [[ "${VERSION}" != 20.04 ]]; then
310-
image_args+=("ghcr.io/homebrew/ubuntu${VERSION}@sha256:$(<"${RUNNER_TEMP}/digests/${VERSION}-arm64")")
311-
fi
312279
313280
attempts=0
314281
until docker buildx imagetools create "${tag_args[@]}" "${image_args[@]}"; do

0 commit comments

Comments
 (0)