Sync dev with master #241

Merged
GCG.Admin (Automatisiert) merged 7 commits from master into dev 2023-09-30 11:59:33 +02:00
Showing only changes of commit 796636ee4e - Show all commits

@ -5,7 +5,7 @@ on:
branches:
- master
schedule:
- cron: '22 13 * * *'
- cron: '0 0 * * *'
concurrency:
group: ${{ gitea.workflow }}-${{ gitea.ref }}
@ -13,7 +13,7 @@ concurrency:
jobs:
prod-build:
if: gitea.repository == 'gcg/gcg-website' && gitea.event_name == 'push'
if: gitea.repository == 'gcg/gcg-website'
runs-on: act-runner-user
timeout-minutes: 5
steps:
@ -40,7 +40,7 @@ jobs:
token: ${{ secrets.TG_TOKEN }}
include_commit_info: false
test-build:
if: gitea.repository == 'gcg/gcg-website' && gitea.event_name == 'push'
if: gitea.repository == 'gcg/gcg-website'
runs-on: act-runner-user
timeout-minutes: 5
steps:
@ -59,11 +59,11 @@ jobs:
cd /opt/data/actions/gcg-website-master/test
rsync -azr --delete ./ /opt/data/webdata/gcg-website-test/
auto-rebuild:
if: gitea.repository == 'gcg/gcg-website' && gitea.event_name != ''
if: gitea.repository == 'gcg/gcg-website'
runs-on: act-runner-user
timeout-minutes: 5
steps:
- name: ${{ gitea.event_name }}
- name: pull
run: |
cd /opt/data/actions/gcg-website-master
git fetch --all