diff --git a/.github/workflows/deploy.yml b/.github/workflows/preview-deploy.yml similarity index 82% rename from .github/workflows/deploy.yml rename to .github/workflows/preview-deploy.yml index 9f7609b0..e50a0698 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/preview-deploy.yml @@ -1,12 +1,15 @@ -name: preview deployment +name: Preview Deployment + on: workflow_run: - workflows: ["docker image"] + workflows: ["Development Image"] types: - completed + concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }} cancel-in-progress: true + jobs: deployment: if: ${{ github.event.workflow_run.conclusion == 'success' }} @@ -20,7 +23,7 @@ jobs: webhook_id: ${{ secrets.DISCORD_WEBHOOK_ID }} webhook_token: ${{ secrets.DISCORD_WEBHOOK_TOKEN }} color: "#6848a9" - message: "Deployment started." + message: Deployment ${{ github.ref_name }} started - name: ssh uses: appleboy/ssh-action@master with: @@ -35,4 +38,4 @@ jobs: webhook_id: ${{ secrets.DISCORD_WEBHOOK_ID }} webhook_token: ${{ secrets.DISCORD_WEBHOOK_TOKEN }} color: "#6848a9" - message: "Deployment complete." + message: Deployment ${{ github.ref_name }} complete diff --git a/.github/workflows/publish-tags.yml b/.github/workflows/publish-tags.yml index 3db152ce..839134ba 100644 --- a/.github/workflows/publish-tags.yml +++ b/.github/workflows/publish-tags.yml @@ -3,7 +3,7 @@ name: Release Image on: push: tags: - - "v*" + - "[0-9]*" concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -27,13 +27,18 @@ jobs: cd neodb-takahe echo "takahe=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + - name: Overwrite version in code + env: + REF_NAME: ${{ github.ref_name }} + run: echo '__version__ = "'$REF_NAME'"' > boofilsic/__init__.py + - name: Send Discord notification uses: appleboy/discord-action@master with: webhook_id: ${{ secrets.DISCORD_WEBHOOK_ID }} webhook_token: ${{ secrets.DISCORD_WEBHOOK_TOKEN }} color: "#1857a4" - message: Building release image ${{ steps.version.outputs.neodb }}-${{ steps.version.outputs.takahe }} + message: Building release image ${{ github.ref_name }}-${{ steps.version.outputs.neodb }}-${{ steps.version.outputs.takahe }} - name: Set up QEMU uses: docker/setup-qemu-action@v2 @@ -48,8 +53,9 @@ jobs: images: neodb/neodb tags: | type=raw,value=latest - type=semver,pattern={{version}} - type=raw,value=${{ steps.version.outputs.neodb }}-${{ steps.version.outputs.takahe }} + type=pep440,pattern={{version}} + type=pep440,pattern={{major}}.{{minor}} + # type=raw,value=${{ steps.version.outputs.version }}-${{ steps.version.outputs.neodb }}-${{ steps.version.outputs.takahe }} - name: Login to DockerHub if: github.event_name != 'pull_request' @@ -73,4 +79,4 @@ jobs: webhook_id: ${{ secrets.DISCORD_WEBHOOK_ID }} webhook_token: ${{ secrets.DISCORD_WEBHOOK_TOKEN }} color: "#1857a4" - message: Published release image ${{ steps.version.outputs.neodb }}-${{ steps.version.outputs.takahe }} + message: Published release image ${{ github.ref_name }}-${{ steps.version.outputs.neodb }}-${{ steps.version.outputs.takahe }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a9893497..6b44d7c0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -31,13 +31,18 @@ jobs: cd neodb-takahe echo "takahe=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + - name: Overwrite version in code + env: + REF_NAME: ${{ github.ref_name }} + run: echo '__version__ = "'$REF_NAME'"' > boofilsic/__init__.py + - name: Send Discord notification uses: appleboy/discord-action@master with: webhook_id: ${{ secrets.DISCORD_WEBHOOK_ID }} webhook_token: ${{ secrets.DISCORD_WEBHOOK_TOKEN }} color: "#1857a4" - message: Building development image ${{ steps.version.outputs.neodb }}-${{ steps.version.outputs.takahe }} + message: Building development image ${{ github.ref_name }}-${{ steps.version.outputs.neodb }}-${{ steps.version.outputs.takahe }} - name: Set up QEMU uses: docker/setup-qemu-action@v2 @@ -75,4 +80,4 @@ jobs: webhook_id: ${{ secrets.DISCORD_WEBHOOK_ID }} webhook_token: ${{ secrets.DISCORD_WEBHOOK_TOKEN }} color: "#1857a4" - message: Published development image ${{ steps.version.outputs.neodb }}-${{ steps.version.outputs.takahe }} + message: Published development image ${{ github.ref_name }}-${{ steps.version.outputs.neodb }}-${{ steps.version.outputs.takahe }} diff --git a/README.md b/README.md index 7984f650..65ef31bc 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ ![](https://github.com/neodb-social/neodb/actions/workflows/check.yml/badge.svg?branch=main) ![](https://github.com/neodb-social/neodb/actions/workflows/tests.yml/badge.svg?branch=main) ![](https://github.com/neodb-social/neodb/actions/workflows/publish.yml/badge.svg?branch=main) +![](https://github.com/neodb-social/neodb/actions/workflows/publish-tags.yml/badge.svg) NeoDB (fka boofilsic) is an open source project and free service to help users manage, share and discover collections, reviews and ratings for culture products (e.g. books, movies, music, podcasts, games and performances) in Fediverse. diff --git a/boofilsic/__init__.py b/boofilsic/__init__.py index 3e2f46a3..eb1b2324 100644 --- a/boofilsic/__init__.py +++ b/boofilsic/__init__.py @@ -1 +1 @@ -__version__ = "0.9.0" +__version__ = "dev"