Merge branch 'main' into dev
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 15s

This commit is contained in:
Denys Konovalov 2024-07-07 12:21:16 +02:00
commit 56e6b6728b
2 changed files with 5 additions and 5 deletions

@ -2,13 +2,13 @@ name: Website Prod/Test
on: on:
push: push:
branches: [master] branches: [main]
schedule: schedule:
- cron: '@daily' - cron: '@daily'
defaults: defaults:
run: run:
working-directory: /opt/runner/workdir/gcg-website-master working-directory: /opt/runner/workdir/gcg-website-main
jobs: jobs:
prod-build: prod-build:
@ -19,7 +19,7 @@ jobs:
- name: Pull - name: Pull
run: | run: |
git fetch --all git fetch --all
git reset --hard origin/master git reset --hard origin/main
- name: Build - name: Build
run: | run: |
rm -rf public rm -rf public
@ -43,7 +43,7 @@ jobs:
- name: Pull - name: Pull
run: | run: |
git fetch --all git fetch --all
git reset --hard origin/master git reset --hard origin/main
- name: Build - name: Build
run: | run: |
rm -rf test rm -rf test

@ -13,7 +13,7 @@ const config = {
backend: { backend: {
name: "gitea", name: "gitea",
repo: "gcg/gcg-website", repo: "gcg/gcg-website",
branch: "master", branch: "main",
api_root: "https://git.cantorgymnasium.de/api/v1", api_root: "https://git.cantorgymnasium.de/api/v1",
base_url: "https://git.cantorgymnasium.de", base_url: "https://git.cantorgymnasium.de",
app_id: "1b612fb1-fbc1-44b2-9b9d-6eeb1dc55bff", app_id: "1b612fb1-fbc1-44b2-9b9d-6eeb1dc55bff",