Merge branch 'main' into dev
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 15s
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 15s
This commit is contained in:
commit
56e6b6728b
@ -2,13 +2,13 @@ name: Website Prod/Test
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [master]
|
||||
branches: [main]
|
||||
schedule:
|
||||
- cron: '@daily'
|
||||
|
||||
defaults:
|
||||
run:
|
||||
working-directory: /opt/runner/workdir/gcg-website-master
|
||||
working-directory: /opt/runner/workdir/gcg-website-main
|
||||
|
||||
jobs:
|
||||
prod-build:
|
||||
@ -19,7 +19,7 @@ jobs:
|
||||
- name: Pull
|
||||
run: |
|
||||
git fetch --all
|
||||
git reset --hard origin/master
|
||||
git reset --hard origin/main
|
||||
- name: Build
|
||||
run: |
|
||||
rm -rf public
|
||||
@ -43,7 +43,7 @@ jobs:
|
||||
- name: Pull
|
||||
run: |
|
||||
git fetch --all
|
||||
git reset --hard origin/master
|
||||
git reset --hard origin/main
|
||||
- name: Build
|
||||
run: |
|
||||
rm -rf test
|
||||
|
@ -13,7 +13,7 @@ const config = {
|
||||
backend: {
|
||||
name: "gitea",
|
||||
repo: "gcg/gcg-website",
|
||||
branch: "master",
|
||||
branch: "main",
|
||||
api_root: "https://git.cantorgymnasium.de/api/v1",
|
||||
base_url: "https://git.cantorgymnasium.de",
|
||||
app_id: "1b612fb1-fbc1-44b2-9b9d-6eeb1dc55bff",
|
||||
|
Loading…
x
Reference in New Issue
Block a user