From e46ece6be11aef4b466478d1d39e1687c118aaa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Nowacki?= <michal.nowacki@reef.pl>
Date: Sun, 29 Oct 2023 13:40:21 +0100
Subject: [PATCH] cd and CHANGELOG fix

---
 .github/workflows/cd.yml | 35 -----------------------------------
 CHANGELOG.md             |  4 +++-
 2 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 0716f6fd5..adafe1f5b 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -123,38 +123,3 @@ jobs:
           draft: ${{ env.ACTIONS_STEP_DEBUG == 'true' }}
           prerelease: false
           files: ${{ steps.sign.outputs.asset_path }}
-  deploy-docker:
-    needs: deploy
-    runs-on: ubuntu-latest
-    container:
-      image: "python:3.10"  # can not use ${{ env.PYTHON_DEFAULT_VERSION }} here
-      env:
-        DEBIAN_FRONTEND: noninteractive
-        DOCKERHUB_USERNAME: secrets.DOCKERHUB_USERNAME
-        DOCKERHUB_TOKEN: secrets.DOCKERHUB_TOKEN
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Install dependencies
-        run: python -m pip install --upgrade nox pip setuptools
-      - name: Build Dockerfile
-        id: build-dockerfile
-        run: nox -vs docker
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to Docker Hub
-        if: ${{ env.DOCKERHUB_USERNAME != '' && env.DOCKERHUB_TOKEN != '' }}  # TODO: skip whole job without marking it as an error
-        uses: docker/login-action@v2
-        with:
-          username: ${{ env.DOCKERHUB_USERNAME }}
-          password: ${{ env.DOCKERHUB_TOKEN }}
-      - name: Build and push
-        if: ${{ env.DOCKERHUB_USERNAME != '' && env.DOCKERHUB_TOKEN != '' }}  # TODO: skip whole job without marking it as an error
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          push: true
-          tags: backblaze/b2:${{ steps.build.outputs.version }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2dcd61cc8..a2d2f873d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [3.12.0] - 2023-10-28
 
+### Added
+* docker tests and pushing the official docker image on release
+
 ### Fixed
 * `--quiet` now will implicitly set `--noProgress` option as well
 * pypy integration tests
@@ -40,7 +43,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [3.10.0] - 2023-09-10
 
 ### Added
-* docker tests and pushing the official docker image on release
 * Add ability to upload from an unbound source such as standard input or a named pipe
 * --bypassGovernance option to delete_file_version
 * Declare official support of Python 3.12