gcg/gcg-website
gcg/gcg-website
1
1
Fork 0
Code Issues 3 Pull Requests Actions Projects 2 Wiki Activity

Sync dev with master #241

Merged
GCG.Admin (Automatisiert) merged 7 commits from master into dev 2023-09-30 11:59:33 +02:00
Conversation 0 Commits 7 Files Changed 4 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 796636ee4e - Show all commits

10
.gitea/workflows/prod.yaml
View File

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