From 95a4f288cd19341f823f6ae2321089710ef4b6fd Mon Sep 17 00:00:00 2001
From: d3vyce <nicolas.sudres@hotmail.fr>
Date: Tue, 2 Apr 2024 19:48:08 +0200
Subject: [PATCH] rework: ci jobs

---
 ...pi-build-version.yml => build-release.yml} | 28 ++++++++++++++++--
 .github/workflows/docker-build-version.yml    | 29 -------------------
 2 files changed, 25 insertions(+), 32 deletions(-)
 rename .github/workflows/{pypi-build-version.yml => build-release.yml} (52%)
 delete mode 100644 .github/workflows/docker-build-version.yml

diff --git a/.github/workflows/pypi-build-version.yml b/.github/workflows/build-release.yml
similarity index 52%
rename from .github/workflows/pypi-build-version.yml
rename to .github/workflows/build-release.yml
index 819d9e5..4a13dae 100644
--- a/.github/workflows/pypi-build-version.yml
+++ b/.github/workflows/build-release.yml
@@ -1,11 +1,33 @@
-name: Build Pypi Package
+name: Build Package/Image
 
 on:
   release:
     types: [published]
 
 jobs:
-  build:
+  build-image:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout code
+        uses: actions/checkout@v4.1.1
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to Docker registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v5.1.0
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ghcr.io/${{ github.repository }}:latest,ghcr.io/${{ github.repository }}:${{  github.ref_name }}
+  build-package:
     runs-on: ubuntu-latest
     steps:
       - name: checkout code
@@ -24,7 +46,7 @@ jobs:
           name: dist
   pypi-publish:
     runs-on: ubuntu-latest
-    needs: build
+    needs: build-package
     environment:
       name: pypi
       url: https://pypi.org/p/teleinfo_exporter/
diff --git a/.github/workflows/docker-build-version.yml b/.github/workflows/docker-build-version.yml
deleted file mode 100644
index 634fa87..0000000
--- a/.github/workflows/docker-build-version.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Build and Push Docker Image
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  build-docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout code
-        uses: actions/checkout@v4.1.1
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Docker registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v5.1.0
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ghcr.io/${{ github.repository }}:latest,ghcr.io/${{ github.repository }}:${{  github.ref_name }}