From ac744a76e3fb8d3409dbd53b731dc5e95db40095 Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Sun, 4 Feb 2024 09:16:57 +0000 Subject: [PATCH 1/2] publish new tagged image on push to master --- .gitea/workflows/semantic-release.yaml | 32 +++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/semantic-release.yaml b/.gitea/workflows/semantic-release.yaml index 05e04d8..689d8c4 100644 --- a/.gitea/workflows/semantic-release.yaml +++ b/.gitea/workflows/semantic-release.yaml @@ -7,6 +7,7 @@ on: jobs: Patch: + name: Patch runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -28,4 +29,33 @@ jobs: echo "The current tag is: ${{ steps.taggerDryRun.outputs.tag }}" - name: echo part run: | - echo "The version increment was: ${{ steps.taggerDryRun.outputs.part }}" \ No newline at end of file + 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@v2 + + - name: Install Docker + run: curl -fsSL https://get.docker.com | sh + + - 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 + + - 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: Login to Harbor + run: docker login -u ${{ secrets.HARBOR_USERNAME }} -p ${{ secrets.HARBOR_PASSWORD }} harbor.evanshome.io + + - name: Push Docker image to Harbor + run: docker push --all-tags harbor.evanshome.io/library/py-eagle-mqtt \ No newline at end of file -- 2.49.1 From 30ab208c1bb8d29554be1730652e1dde55ec244d Mon Sep 17 00:00:00 2001 From: Evan Richardson Date: Sun, 4 Feb 2024 09:19:28 +0000 Subject: [PATCH 2/2] build on everything but master, also change non master build name to dev --- .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 75cfb9a..a0387ca 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -2,10 +2,11 @@ name: Build and publish Image run-name: ${{ gitea.actor }} is building py-eagle-mqtt image on: push: - tags: - - '*' 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: @@ -19,11 +20,11 @@ jobs: run: curl -fsSL https://get.docker.com | sh - name: Build Docker image - run: docker build -t harbor.evanshome.io/library/py-eagle-mqtt:latest ./Docker/ + 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 - name: Push Docker image to Harbor - run: docker push harbor.evanshome.io/library/py-eagle-mqtt:latest + run: docker push harbor.evanshome.io/library/py-eagle-mqtt:dev \ No newline at end of file -- 2.49.1