From e8333f4df19f5379041821c2386e26136e825c6e Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Wed, 6 Mar 2024 07:20:14 +0000 Subject: [PATCH 01/24] Prep for pahoo-mqtt 2 --- Docker/src/bin/dbg-msgHub.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Docker/src/bin/dbg-msgHub.py b/Docker/src/bin/dbg-msgHub.py index 95e6246..737b630 100755 --- a/Docker/src/bin/dbg-msgHub.py +++ b/Docker/src/bin/dbg-msgHub.py @@ -26,7 +26,7 @@ class Client ( mqtt.Client ): self.on_connect = Client.on_connect self.on_message = Client.on_message - def on_connect( self, userData, flags, rc ): + def on_connect( self, userdata, flags, reason_code, properties ): self.subscribe( '#' ) def on_message( self, userData, msg ): @@ -62,4 +62,4 @@ client.loop_start() while True: pass -client.loop_stop( force=True ) +client.loop_stop() From 335acc544bb8815a830601e1aed1611a66204228 Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Wed, 6 Mar 2024 07:21:03 +0000 Subject: [PATCH 02/24] bump paho-mqtt to 2.0.0 --- Docker/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docker/requirements.txt b/Docker/requirements.txt index d4b3685..a8e0ea1 100644 --- a/Docker/requirements.txt +++ b/Docker/requirements.txt @@ -1,3 +1,3 @@ -paho-mqtt==1.6.1 +paho-mqtt==2.0.0 bottle==0.12.25 defusedxml==0.7.1 From 95554eadf016fc43fa661bfcabc15068167425c6 Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Wed, 6 Mar 2024 07:33:09 +0000 Subject: [PATCH 03/24] use docker login action --- .gitea/workflows/publish.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 60f4e78..7e06558 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -20,7 +20,11 @@ jobs: run: docker build -t harbor.evanshome.io/library/py-eagle-mqtt:dev ./Docker/ - name: Login to Harbor - run: docker login -u ${{ secrets.HARBOR_USERNAME }} -p ${{ secrets.HARBOR_PASSWORD }} harbor.evanshome.io + uses: docker/login-action@v3 + with: + registry: harbor.evanshome.io + username: ${{ secrets.HARBOR_USERNAME }} + password: ${{ secrets.HARBOR_PASSWORD }} - name: Push Docker image to Harbor run: docker push harbor.evanshome.io/library/py-eagle-mqtt:dev From dddebdda7dfd1cd1cc5cff7b03b76a5413d98ab1 Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Wed, 6 Mar 2024 07:33:28 +0000 Subject: [PATCH 04/24] Update .gitea/workflows/publish.yaml --- .gitea/workflows/publish.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 7e06558..29eeccd 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -21,10 +21,10 @@ jobs: - name: Login to Harbor uses: docker/login-action@v3 - with: - registry: harbor.evanshome.io - username: ${{ secrets.HARBOR_USERNAME }} - password: ${{ secrets.HARBOR_PASSWORD }} + with: + registry: harbor.evanshome.io + username: ${{ secrets.HARBOR_USERNAME }} + password: ${{ secrets.HARBOR_PASSWORD }} - name: Push Docker image to Harbor run: docker push harbor.evanshome.io/library/py-eagle-mqtt:dev From 4baa37cc6cd2e4773c2242abe9e239f0136ac3b1 Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Wed, 6 Mar 2024 07:54:30 +0000 Subject: [PATCH 05/24] use build and push action --- .gitea/workflows/publish.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 29eeccd..1fb69d4 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -16,9 +16,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v4.1.1 - - name: Build Docker image - run: docker build -t harbor.evanshome.io/library/py-eagle-mqtt:dev ./Docker/ - - name: Login to Harbor uses: docker/login-action@v3 with: @@ -26,6 +23,10 @@ jobs: username: ${{ secrets.HARBOR_USERNAME }} password: ${{ secrets.HARBOR_PASSWORD }} - - name: Push Docker image to Harbor - run: docker push harbor.evanshome.io/library/py-eagle-mqtt:dev + - name: Build and push + uses: docker/build-push-action@v5 + with: + context: ./Docker/ + push: true + tags: harbor.evanshome.io/library/py-eagle-mqtt:dev \ No newline at end of file From 8faf6c93417a346a34e7950dd584e8a395b13be2 Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Wed, 6 Mar 2024 07:59:49 +0000 Subject: [PATCH 06/24] Update .gitea/workflows/publish.yaml --- .gitea/workflows/publish.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 1fb69d4..0e942cd 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -16,6 +16,9 @@ jobs: - name: Checkout repository uses: actions/checkout@v4.1.1 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Login to Harbor uses: docker/login-action@v3 with: From 64b97c0e33a78fd773ceebecbeb5731203a9e861 Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Wed, 6 Mar 2024 08:07:50 +0000 Subject: [PATCH 07/24] Update .gitea/workflows/publish.yaml --- .gitea/workflows/publish.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 0e942cd..ceb3601 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -14,10 +14,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4.1.1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: actions/checkout@v4 - name: Login to Harbor uses: docker/login-action@v3 From 0a9074c1e0ee77e43707ee42f8d87587f5a38603 Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Wed, 6 Mar 2024 08:10:42 +0000 Subject: [PATCH 08/24] Update .gitea/workflows/publish.yaml --- .gitea/workflows/publish.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index ceb3601..34430c2 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -29,4 +29,6 @@ jobs: context: ./Docker/ push: true tags: harbor.evanshome.io/library/py-eagle-mqtt:dev + secrets: | + "github_token=${{ secrets.HARBORTOKEN }}" \ No newline at end of file From 84aa71aaf182a19e0117e313a643cdb80d303514 Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Wed, 6 Mar 2024 08:12:29 +0000 Subject: [PATCH 09/24] Update .gitea/workflows/publish.yaml --- .gitea/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 34430c2..8f315ca 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -30,5 +30,5 @@ jobs: push: true tags: harbor.evanshome.io/library/py-eagle-mqtt:dev secrets: | - "github_token=${{ secrets.HARBORTOKEN }}" + GIT_AUTH_TOKEN=${{ secrets.HARBORTOKEN }} \ No newline at end of file From 0d66761ae9abbec430843e9a8d5ac3d3843c9a0b Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Wed, 6 Mar 2024 08:14:00 +0000 Subject: [PATCH 10/24] Update .gitea/workflows/publish.yaml --- .gitea/workflows/publish.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 8f315ca..b071845 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -20,8 +20,8 @@ jobs: uses: docker/login-action@v3 with: registry: harbor.evanshome.io - username: ${{ secrets.HARBOR_USERNAME }} - password: ${{ secrets.HARBOR_PASSWORD }} + username: ${{ secrets.EVAN_USERNAME }} + password: ${{ secrets.EVAN_PASSWORD }} - name: Build and push uses: docker/build-push-action@v5 From 140d07cd7a571ff38afb1a9d4d426ba0c12dcdfa Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Wed, 6 Mar 2024 08:15:51 +0000 Subject: [PATCH 11/24] Update .gitea/workflows/publish.yaml --- .gitea/workflows/publish.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index b071845..7e0b8af 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -15,6 +15,9 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 + + - name: Logout of registry + run: docker logout harbor.evanshome.io - name: Login to Harbor uses: docker/login-action@v3 From 3de86aa1687f890ef2918729953bb41f4170ec4d Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Wed, 6 Mar 2024 08:18:01 +0000 Subject: [PATCH 12/24] Update .gitea/workflows/publish.yaml --- .gitea/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 7e0b8af..4a44540 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -31,7 +31,7 @@ jobs: with: context: ./Docker/ push: true - tags: harbor.evanshome.io/library/py-eagle-mqtt:dev + tags: 'harbor.evanshome.io/library/py-eagle-mqtt:dev' secrets: | GIT_AUTH_TOKEN=${{ secrets.HARBORTOKEN }} \ No newline at end of file From b891855f161138ca27ee5706ba16f8959275f50c Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Wed, 6 Mar 2024 08:26:23 +0000 Subject: [PATCH 13/24] Update .gitea/workflows/publish.yaml --- .gitea/workflows/publish.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 4a44540..41acece 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -32,6 +32,4 @@ jobs: context: ./Docker/ push: true tags: 'harbor.evanshome.io/library/py-eagle-mqtt:dev' - secrets: | - GIT_AUTH_TOKEN=${{ secrets.HARBORTOKEN }} \ No newline at end of file From ad0b0e45ef6fb8f3d20cb240d13d31aac6232932 Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Wed, 6 Mar 2024 23:42:05 +0000 Subject: [PATCH 14/24] try placing callback version --- Docker/src/python/tHome/broker/connect.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docker/src/python/tHome/broker/connect.py b/Docker/src/python/tHome/broker/connect.py index 0e166f2..92c6efb 100644 --- a/Docker/src/python/tHome/broker/connect.py +++ b/Docker/src/python/tHome/broker/connect.py @@ -7,7 +7,7 @@ from . import config import paho.mqtt.client as mqtt #=========================================================================== -class Client( mqtt.Client ): +class Client( mqtt.Client(mqtt.CallbackAPIVersion.VERSION2) ): """Logging client """ def __init__( self, log=None ): From 15341383a8ae3036c005c53873376c091a968129 Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Wed, 6 Mar 2024 23:46:14 +0000 Subject: [PATCH 15/24] Update Docker/src/python/tHome/broker/connect.py --- Docker/src/python/tHome/broker/connect.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docker/src/python/tHome/broker/connect.py b/Docker/src/python/tHome/broker/connect.py index 92c6efb..f4a5f98 100644 --- a/Docker/src/python/tHome/broker/connect.py +++ b/Docker/src/python/tHome/broker/connect.py @@ -7,7 +7,7 @@ from . import config import paho.mqtt.client as mqtt #=========================================================================== -class Client( mqtt.Client(mqtt.CallbackAPIVersion.VERSION2) ): +class Client( mqtt.Client(mqtt.CallbackAPIVersion.VERSION1) ): """Logging client """ def __init__( self, log=None ): From 2f12de623c63d6b0bddb534c11107a61a30939d5 Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Wed, 6 Mar 2024 23:49:30 +0000 Subject: [PATCH 16/24] Update Docker/src/python/tHome/broker/connect.py --- Docker/src/python/tHome/broker/connect.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Docker/src/python/tHome/broker/connect.py b/Docker/src/python/tHome/broker/connect.py index f4a5f98..60435f8 100644 --- a/Docker/src/python/tHome/broker/connect.py +++ b/Docker/src/python/tHome/broker/connect.py @@ -7,10 +7,10 @@ from . import config import paho.mqtt.client as mqtt #=========================================================================== -class Client( mqtt.Client(mqtt.CallbackAPIVersion.VERSION1) ): +class Client( mqtt.Client ): """Logging client """ - def __init__( self, log=None ): + def __init__( mqtt.CallbackAPIVersion.VERSION1, self, log=None ): mqtt.Client.__init__( self ) self._logger = log # Restore callbacks overwritten by stupid mqtt library From 54c2e5af98720838d110d1bcabed36c3a0ff2a49 Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Wed, 6 Mar 2024 23:51:02 +0000 Subject: [PATCH 17/24] Update Docker/src/python/tHome/broker/connect.py --- Docker/src/python/tHome/broker/connect.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Docker/src/python/tHome/broker/connect.py b/Docker/src/python/tHome/broker/connect.py index 60435f8..f4a5f98 100644 --- a/Docker/src/python/tHome/broker/connect.py +++ b/Docker/src/python/tHome/broker/connect.py @@ -7,10 +7,10 @@ from . import config import paho.mqtt.client as mqtt #=========================================================================== -class Client( mqtt.Client ): +class Client( mqtt.Client(mqtt.CallbackAPIVersion.VERSION1) ): """Logging client """ - def __init__( mqtt.CallbackAPIVersion.VERSION1, self, log=None ): + def __init__( self, log=None ): mqtt.Client.__init__( self ) self._logger = log # Restore callbacks overwritten by stupid mqtt library From b6f5ecda3bea6d486049794da8c71a56f31901b0 Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Wed, 6 Mar 2024 23:54:04 +0000 Subject: [PATCH 18/24] Update Docker/src/python/tHome/broker/connect.py --- Docker/src/python/tHome/broker/connect.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Docker/src/python/tHome/broker/connect.py b/Docker/src/python/tHome/broker/connect.py index f4a5f98..47c8274 100644 --- a/Docker/src/python/tHome/broker/connect.py +++ b/Docker/src/python/tHome/broker/connect.py @@ -7,11 +7,11 @@ from . import config import paho.mqtt.client as mqtt #=========================================================================== -class Client( mqtt.Client(mqtt.CallbackAPIVersion.VERSION1) ): +class Client( mqtt.Client ): """Logging client """ def __init__( self, log=None ): - mqtt.Client.__init__( self ) + mqtt.Client.__init__( self, mqtt.CallbackAPIVersion.VERSION2 ) self._logger = log # Restore callbacks overwritten by stupid mqtt library self.on_log = Client.on_log From 26b05b10307f9aaac604b01ac3a92c6ad68f756f Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Thu, 7 Mar 2024 05:59:52 +0000 Subject: [PATCH 19/24] Try recommended workflow --- .gitea/workflows/semantic-release.yaml | 100 ++++++++++++------------- 1 file changed, 49 insertions(+), 51 deletions(-) diff --git a/.gitea/workflows/semantic-release.yaml b/.gitea/workflows/semantic-release.yaml index 1e9d0ed..744fe48 100644 --- a/.gitea/workflows/semantic-release.yaml +++ b/.gitea/workflows/semantic-release.yaml @@ -1,63 +1,61 @@ -name: Semantic Release and Changelog -run-name: ${{ gitea.actor }} is running Semantic Release +name: ci + on: + schedule: + - cron: "0 10 * * *" push: branches: - - 'master' + - "**" + tags: + - "v*.*.*" + pull_request: + branches: + - "main" jobs: - Patch: - name: Patch + docker: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4.1.1 - with: - fetch-depth: '0' - - name: Minor version for each merge - id: taggerDryRun - uses: anothrNick/github-tag-action@1.67.0 - env: - GITHUB_TOKEN: ${{ secrets.REPO_PUSH_TOKEN }} - WITH_V: true - DRY_RUN: true - - - name: echo new tag - run: | - echo "The next tag version will be: ${{ steps.taggerDryRun.outputs.new_tag }}" - - name: echo tag - run: | - echo "The current tag is: ${{ steps.taggerDryRun.outputs.tag }}" - - name: echo part - run: | - echo "The version increment was: ${{ steps.taggerDryRun.outputs.part }}" - - Build-and-Publish: - name: Build and Publish - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v4.1.1 - - - name: Login to Harbor - uses: docker/login-action@v2.2.0 - with: - registry: harbor.evanshome.io - username: "robot$registry-bot" + - name: Checkout + uses: actions/checkout@v4 + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + # list of Docker images to use as base name for tags + images: | + name/app + # generate Docker tags based on the following events/attributes + tags: | + type=schedule + type=ref,event=branch + type=ref,event=pr + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} + type=sha + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Login to Harbor + if: github.event_name != 'pull_request' + uses: docker/login-action@v3 + with: + registry: harbor.evanshome.io + username: ${{ secrets.HARBOR_USERNAME }} password: ${{ secrets.HARBOR_PASSWORD }} + - name: Build and push + uses: docker/build-push-action@v5 + with: + context: . + push: ${{ github.event_name != 'pull_request' }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + + + - - name: Build Docker image - run: docker build -t harbor.evanshome.io/library/py-eagle-mqtt:latest ./Docker/ - - name: Minor version for each merge - id: taggerFinal - uses: anothrNick/github-tag-action@1.67.0 - env: - GITHUB_TOKEN: ${{ secrets.REPO_PUSH_TOKEN }} - WITH_V: true - GIT_API_TAGGING: false - - name: tag with name - run: docker tag harbor.evanshome.io/library/py-eagle-mqtt:latest harbor.evanshome.io/library/py-eagle-mqtt:${{ steps.taggerFinal.outputs.new_tag }} - - name: Push Docker image to Harbor - run: docker push --all-tags harbor.evanshome.io/library/py-eagle-mqtt \ No newline at end of file From 93baabb7435df7d5169dfaef839037f73fb94201 Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Thu, 7 Mar 2024 06:01:37 +0000 Subject: [PATCH 20/24] fix indent typo and remove qemu --- .gitea/workflows/semantic-release.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/semantic-release.yaml b/.gitea/workflows/semantic-release.yaml index 744fe48..02d66ba 100644 --- a/.gitea/workflows/semantic-release.yaml +++ b/.gitea/workflows/semantic-release.yaml @@ -34,8 +34,6 @@ jobs: type=semver,pattern={{major}}.{{minor}} type=semver,pattern={{major}} type=sha - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Login to Harbor @@ -43,8 +41,8 @@ jobs: uses: docker/login-action@v3 with: registry: harbor.evanshome.io - username: ${{ secrets.HARBOR_USERNAME }} - password: ${{ secrets.HARBOR_PASSWORD }} + username: ${{ secrets.HARBOR_USERNAME }} + password: ${{ secrets.HARBOR_PASSWORD }} - name: Build and push uses: docker/build-push-action@v5 with: From 75152dc33bd8211bf5c73801b965fee65eb44b46 Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Thu, 7 Mar 2024 06:04:07 +0000 Subject: [PATCH 21/24] Delete .gitea/workflows/publish.yaml --- .gitea/workflows/publish.yaml | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 .gitea/workflows/publish.yaml diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml deleted file mode 100644 index 41acece..0000000 --- a/.gitea/workflows/publish.yaml +++ /dev/null @@ -1,35 +0,0 @@ -name: Build and publish Image -run-name: ${{ gitea.actor }} is building py-eagle-mqtt image -on: - push: - branches: - - '*' # matches every branch that doesn't contain a '/' - - '*/*' # matches every branch containing a single '/' - - '**' # matches every branch - - '!master' # excludes master - -jobs: - build-and-push: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Logout of registry - run: docker logout harbor.evanshome.io - - - name: Login to Harbor - uses: docker/login-action@v3 - with: - registry: harbor.evanshome.io - username: ${{ secrets.EVAN_USERNAME }} - password: ${{ secrets.EVAN_PASSWORD }} - - - name: Build and push - uses: docker/build-push-action@v5 - with: - context: ./Docker/ - push: true - tags: 'harbor.evanshome.io/library/py-eagle-mqtt:dev' - \ No newline at end of file From 6c9e6f792e06ab21d2cccfd7b7267e0b0c011959 Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Thu, 7 Mar 2024 06:04:50 +0000 Subject: [PATCH 22/24] fix context path --- .gitea/workflows/semantic-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/semantic-release.yaml b/.gitea/workflows/semantic-release.yaml index 02d66ba..6a4a3ad 100644 --- a/.gitea/workflows/semantic-release.yaml +++ b/.gitea/workflows/semantic-release.yaml @@ -46,7 +46,7 @@ jobs: - name: Build and push uses: docker/build-push-action@v5 with: - context: . + context: ./Docker/ push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} From 6c2f1f26eed6cc4ff9ee7dd6facfdf23244acc8c Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Thu, 7 Mar 2024 06:07:37 +0000 Subject: [PATCH 23/24] replace image name --- .gitea/workflows/semantic-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/semantic-release.yaml b/.gitea/workflows/semantic-release.yaml index 6a4a3ad..cd50bb2 100644 --- a/.gitea/workflows/semantic-release.yaml +++ b/.gitea/workflows/semantic-release.yaml @@ -24,7 +24,7 @@ jobs: with: # list of Docker images to use as base name for tags images: | - name/app + harbor.evanshome.io/library/py-eagle-mqtt # generate Docker tags based on the following events/attributes tags: | type=schedule From 1811bd2b75d35c55703073ebc3a13602fde4af80 Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Thu, 7 Mar 2024 06:20:06 +0000 Subject: [PATCH 24/24] add semver tagging workflow --- .gitea/workflows/tag-release.yaml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .gitea/workflows/tag-release.yaml diff --git a/.gitea/workflows/tag-release.yaml b/.gitea/workflows/tag-release.yaml new file mode 100644 index 0000000..09854b9 --- /dev/null +++ b/.gitea/workflows/tag-release.yaml @@ -0,0 +1,25 @@ +name: Bump version +on: + pull_request: + types: + - closed + branches: + - master + +jobs: + create_release_tag: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4.1.1 + with: + ref: ${{ github.event.pull_request.merge_commit_sha }} + fetch-depth: '0' + + - name: Create Release Tag + id: taggerFinal + uses: anothrNick/github-tag-action@1.67.0 + with: + GITHUB_TOKEN: ${{ secrets.REPO_PUSH_TOKEN }} + WITH_V: true + GIT_API_TAGGING: false