From 11d72161a36e76a5f7c8f76a7043d6934dd703bb Mon Sep 17 00:00:00 2001 From: Matt Armand Date: Tue, 20 Dec 2022 13:29:34 -0500 Subject: [PATCH 1/6] Add latest_prerelease Docker Hub tag for following the latest alpha release --- .github/workflows/docker.yml | 11 +++++++++++ CHANGES.md | 2 ++ docs/usage_and_configuration/black_docker_image.md | 2 ++ 3 files changed, 15 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 855186f9bf1..04e30e727bd 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -54,5 +54,16 @@ jobs: push: true tags: pyfound/black:latest_release + - name: Build and push latest_prerelease tag + if: + ${{ github.event_name == 'release' && github.event.action == 'published' && + github.event.release.prerelease }} + uses: docker/build-push-action@v3 + with: + context: . + platforms: linux/amd64,linux/arm64 + push: true + tags: pyfound/black:latest_prerelease + - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/CHANGES.md b/CHANGES.md index 61608c361cb..8d3b016e927 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -65,6 +65,8 @@ - Move 3.11 CI to normal flow now all dependencies support 3.11 (#3446) +- Docker: Add new `latest_prerelease` tag automation to follow latest black alpha release + on docker images ### Documentation diff --git a/docs/usage_and_configuration/black_docker_image.md b/docs/usage_and_configuration/black_docker_image.md index 8de566ea270..fc4b04812ed 100644 --- a/docs/usage_and_configuration/black_docker_image.md +++ b/docs/usage_and_configuration/black_docker_image.md @@ -10,6 +10,8 @@ _Black_ images with the following tags are available: - `latest_release` - tag created when a new version of _Black_ is released.\ ℹ Recommended for users who want to use released versions of _Black_. It maps to [the latest release](https://github.com/psf/black/releases/latest) of _Black_. +- `latest_prerelease` - tag created when a new alpha (prerelease) version of _Black_ is released.\ + ℹ Recommended for users who want to preview or test alpha versions of _Black_. - `latest` - tag used for the newest image of _Black_.\ ℹ Recommended for users who always want to use the latest version of _Black_, even before it is released. From 549dc862d30d47b62d858d0ab35f8ae9329eb1c3 Mon Sep 17 00:00:00 2001 From: Matt Armand Date: Tue, 20 Dec 2022 14:01:11 -0500 Subject: [PATCH 2/6] add MR to changelog now that it's generated --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 8d3b016e927..24e2ce3c445 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -66,7 +66,7 @@ - Move 3.11 CI to normal flow now all dependencies support 3.11 (#3446) - Docker: Add new `latest_prerelease` tag automation to follow latest black alpha release - on docker images + on docker images (#3465) ### Documentation From 80f97922aa73fa6af800c8797e483d3acf299977 Mon Sep 17 00:00:00 2001 From: Matt Armand Date: Tue, 20 Dec 2022 14:19:15 -0500 Subject: [PATCH 3/6] appease the almighty linter --- CHANGES.md | 4 ++-- docs/usage_and_configuration/black_docker_image.md | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 24e2ce3c445..da9e271da09 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -65,8 +65,8 @@ - Move 3.11 CI to normal flow now all dependencies support 3.11 (#3446) -- Docker: Add new `latest_prerelease` tag automation to follow latest black alpha release - on docker images (#3465) +- Docker: Add new `latest_prerelease` tag automation to follow latest black alpha + release on docker images (#3465) ### Documentation diff --git a/docs/usage_and_configuration/black_docker_image.md b/docs/usage_and_configuration/black_docker_image.md index fc4b04812ed..3af0086b76f 100644 --- a/docs/usage_and_configuration/black_docker_image.md +++ b/docs/usage_and_configuration/black_docker_image.md @@ -10,7 +10,8 @@ _Black_ images with the following tags are available: - `latest_release` - tag created when a new version of _Black_ is released.\ ℹ Recommended for users who want to use released versions of _Black_. It maps to [the latest release](https://github.com/psf/black/releases/latest) of _Black_. -- `latest_prerelease` - tag created when a new alpha (prerelease) version of _Black_ is released.\ +- `latest_prerelease` - tag created when a new alpha (prerelease) version of _Black_ is + released.\ ℹ Recommended for users who want to preview or test alpha versions of _Black_. - `latest` - tag used for the newest image of _Black_.\ ℹ Recommended for users who always want to use the latest version of _Black_, even before From 4e6e9c8a1039bc8d04b47df084910c84277ec804 Mon Sep 17 00:00:00 2001 From: Matt Armand Date: Tue, 20 Dec 2022 17:33:13 -0500 Subject: [PATCH 4/6] Add prerelease note so folks don't get confused why their alpha is old. At some point, more release process docs to follow on the Alphas --- docs/usage_and_configuration/black_docker_image.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/usage_and_configuration/black_docker_image.md b/docs/usage_and_configuration/black_docker_image.md index 3af0086b76f..df39f5374ee 100644 --- a/docs/usage_and_configuration/black_docker_image.md +++ b/docs/usage_and_configuration/black_docker_image.md @@ -12,7 +12,8 @@ _Black_ images with the following tags are available: of _Black_. - `latest_prerelease` - tag created when a new alpha (prerelease) version of _Black_ is released.\ - ℹ Recommended for users who want to preview or test alpha versions of _Black_. + ℹ Recommended for users who want to preview or test alpha versions of _Black_. Note that + the most recent release may be newer than any prerelease. - `latest` - tag used for the newest image of _Black_.\ ℹ Recommended for users who always want to use the latest version of _Black_, even before it is released. From 67161eda725d16d7846fb544e5ebe5cce0ced0f0 Mon Sep 17 00:00:00 2001 From: Matthew Armand Date: Tue, 20 Dec 2022 17:42:46 -0500 Subject: [PATCH 5/6] Update docs/usage_and_configuration/black_docker_image.md Co-authored-by: Jelle Zijlstra --- docs/usage_and_configuration/black_docker_image.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/usage_and_configuration/black_docker_image.md b/docs/usage_and_configuration/black_docker_image.md index df39f5374ee..de8fabd9421 100644 --- a/docs/usage_and_configuration/black_docker_image.md +++ b/docs/usage_and_configuration/black_docker_image.md @@ -13,7 +13,8 @@ _Black_ images with the following tags are available: - `latest_prerelease` - tag created when a new alpha (prerelease) version of _Black_ is released.\ ℹ Recommended for users who want to preview or test alpha versions of _Black_. Note that - the most recent release may be newer than any prerelease. + the most recent release may be newer than any prerelease, because no prereleases + are created before most releases. - `latest` - tag used for the newest image of _Black_.\ ℹ Recommended for users who always want to use the latest version of _Black_, even before it is released. From 78ccda96b5237e24b9f1db485c28282b38aab354 Mon Sep 17 00:00:00 2001 From: Matt Armand Date: Tue, 20 Dec 2022 17:47:07 -0500 Subject: [PATCH 6/6] prettier, you're a cruel mistress --- docs/usage_and_configuration/black_docker_image.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/usage_and_configuration/black_docker_image.md b/docs/usage_and_configuration/black_docker_image.md index de8fabd9421..85aec91ef1c 100644 --- a/docs/usage_and_configuration/black_docker_image.md +++ b/docs/usage_and_configuration/black_docker_image.md @@ -13,8 +13,8 @@ _Black_ images with the following tags are available: - `latest_prerelease` - tag created when a new alpha (prerelease) version of _Black_ is released.\ ℹ Recommended for users who want to preview or test alpha versions of _Black_. Note that - the most recent release may be newer than any prerelease, because no prereleases - are created before most releases. + the most recent release may be newer than any prerelease, because no prereleases are created + before most releases. - `latest` - tag used for the newest image of _Black_.\ ℹ Recommended for users who always want to use the latest version of _Black_, even before it is released.