From d493d7534bcc1188513e678fffe8e8fa65aaaaa9 Mon Sep 17 00:00:00 2001
From: Michael The <michael.the@teampicnic.com>
Date: Fri, 29 Mar 2024 00:25:36 +0100
Subject: [PATCH] Combine create-release with pypi-build-and-deploy

---
 ...eploy.yml => build-deploy-and-release.yml} | 25 ++++++++++++++++-
 .github/workflows/create-release.yml          | 28 -------------------
 2 files changed, 24 insertions(+), 29 deletions(-)
 rename .github/workflows/{pypi-build-and-deploy.yml => build-deploy-and-release.yml} (54%)
 delete mode 100644 .github/workflows/create-release.yml

diff --git a/.github/workflows/pypi-build-and-deploy.yml b/.github/workflows/build-deploy-and-release.yml
similarity index 54%
rename from .github/workflows/pypi-build-and-deploy.yml
rename to .github/workflows/build-deploy-and-release.yml
index 59c8a54..249fd61 100644
--- a/.github/workflows/pypi-build-and-deploy.yml
+++ b/.github/workflows/build-deploy-and-release.yml
@@ -1,4 +1,4 @@
-name: pypi-build-and-deploy
+name: build-deploy-and-release
 
 # Only run this workflow when a diepvries/* tag gets pushed
 on:
@@ -29,3 +29,26 @@ jobs:
         run: python -m tox -e build
       - name: Run tox upload
         run: python -m tox -e upload
+
+  create-github-release:
+
+    runs-on: ubuntu-22.04
+
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Create Github release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          draft: false
+          prerelease: false
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
deleted file mode 100644
index 731d06a..0000000
--- a/.github/workflows/create-release.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: create-release
-
-# Only run this workflow when a diepvries/* tag gets pushed
-on:
-  push:
-    tags:
-      - diepvries/*
-
-permissions:
-  contents: write
-
-jobs:
-  build:
-    name: Create Release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
-          draft: false
-          prerelease: false