mirror of
https://github.com/maxdorninger/MediaManager.git
synced 2026-04-18 06:54:03 +02:00
Merge remote-tracking branch 'origin/master'
# Conflicts: # .github/workflows/build-push-backend.yml
This commit is contained in:
4
.github/workflows/build-docs.yml
vendored
4
.github/workflows/build-docs.yml
vendored
@@ -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
|
||||
|
||||
6
.github/workflows/build-push-backend.yml
vendored
6
.github/workflows/build-push-backend.yml
vendored
@@ -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
|
||||
|
||||
3
.github/workflows/build-push-frontend.yml
vendored
3
.github/workflows/build-push-frontend.yml
vendored
@@ -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}}
|
||||
|
||||
Reference in New Issue
Block a user