From 8c4157e768acde9dc4dc45ad3b39b5b0f8d8d3b1 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sun, 7 Jul 2024 12:12:05 +0200 Subject: [PATCH] switch master branch to main --- .gitea/workflows/prod.yaml | 8 ++++---- static/admin/config/index.js | 2 +- static/admin/config/schulchronik.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/prod.yaml b/.gitea/workflows/prod.yaml index 53799d30..2ce4e37e 100644 --- a/.gitea/workflows/prod.yaml +++ b/.gitea/workflows/prod.yaml @@ -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 diff --git a/static/admin/config/index.js b/static/admin/config/index.js index d48d320f..7b8eeee4 100644 --- a/static/admin/config/index.js +++ b/static/admin/config/index.js @@ -23,7 +23,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", diff --git a/static/admin/config/schulchronik.js b/static/admin/config/schulchronik.js index 209e3e54..013a34b1 100644 --- a/static/admin/config/schulchronik.js +++ b/static/admin/config/schulchronik.js @@ -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",