Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.github/workflows/build-push-backend.yml
This commit is contained in:
maxDorninger
2025-06-01 21:13:24 +02:00
45 changed files with 697 additions and 230 deletions

View File

@@ -4,7 +4,7 @@ on:
push:
branches: [ "master" ]
paths:
- 'docs/**'
- 'Writerside/**'
- '.github/workflows/build-docs.yml'
workflow_dispatch:
@@ -104,4 +104,4 @@ jobs:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
uses: actions/deploy-pages@v4

View File

@@ -40,13 +40,9 @@ jobs:
with:
images: ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}/backend
tags: |
# set latest tag for default branch
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
# tag event 'refs/tags/v1.0.0' will generate 'v1.0.0'
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
type=ref,event=tag
# branch event 'refs/heads/main' will generate 'main'
type=ref,event=branch
# sha
type=sha
- name: Build and push Docker image

View File

@@ -6,6 +6,7 @@ on:
- master
tags:
- 'v*.*.*'
- 'v*.*'
paths:
- 'web/**'
- '.github/workflows/build-push-frontend.yml'
@@ -35,7 +36,7 @@ jobs:
with:
images: ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}/frontend
tags: |
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
type=ref,event=tag
type=ref,event=branch
type=semver,pattern={{version}}