From 36cbc44ed64b0d94f822cd318078dab9e583b401 Mon Sep 17 00:00:00 2001 From: Jens L Date: Fri, 3 Jun 2022 19:40:09 +0200 Subject: [PATCH] migrate to main (#3035) closes #3032 Signed-off-by: Jens Langhammer --- .github/pull_request_template.md | 2 +- .github/workflows/ci-main.yml | 4 ++-- .github/workflows/ci-outpost.yml | 4 ++-- .github/workflows/ci-web.yml | 4 ++-- .github/workflows/ci-website.yml | 4 ++-- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/ghcr-retention.yml | 2 +- .github/workflows/translation-compile.yml | 2 +- .github/workflows/web-api-publish.yml | 2 +- README.md | 2 +- authentik/root/settings.py | 2 +- schema.yml | 2 +- tests/e2e/utils.py | 6 +++--- web/security.txt | 2 +- website/docusaurus.config.js | 6 +++--- website/docusaurus.docs-only.js | 6 +++--- website/integrations/services/gitea/index.md | 2 +- 17 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 98eae4be9..f0f6c2dfc 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,7 +1,7 @@ # Details diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index dfd9774ea..93f6ef826 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -3,14 +3,14 @@ name: authentik-ci-main on: push: branches: - - master + - main - next - version-* paths-ignore: - website pull_request: branches: - - master + - main env: POSTGRES_DB: authentik diff --git a/.github/workflows/ci-outpost.yml b/.github/workflows/ci-outpost.yml index 7db83219c..73a7aa318 100644 --- a/.github/workflows/ci-outpost.yml +++ b/.github/workflows/ci-outpost.yml @@ -3,12 +3,12 @@ name: authentik-ci-outpost on: push: branches: - - master + - main - next - version-* pull_request: branches: - - master + - main jobs: lint-golint: diff --git a/.github/workflows/ci-web.yml b/.github/workflows/ci-web.yml index 8e0f63a93..119f341e2 100644 --- a/.github/workflows/ci-web.yml +++ b/.github/workflows/ci-web.yml @@ -3,12 +3,12 @@ name: authentik-ci-web on: push: branches: - - master + - main - next - version-* pull_request: branches: - - master + - main jobs: lint-eslint: diff --git a/.github/workflows/ci-website.yml b/.github/workflows/ci-website.yml index 0603796cb..e3c65b45b 100644 --- a/.github/workflows/ci-website.yml +++ b/.github/workflows/ci-website.yml @@ -3,12 +3,12 @@ name: authentik-ci-website on: push: branches: - - master + - main - next - version-* pull_request: branches: - - master + - main jobs: lint-prettier: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f31cbde26..710a15614 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -2,10 +2,10 @@ name: "CodeQL" on: push: - branches: [ master, '*', next, version* ] + branches: [ main, '*', next, version* ] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [ main ] schedule: - cron: '30 6 * * 5' diff --git a/.github/workflows/ghcr-retention.yml b/.github/workflows/ghcr-retention.yml index 56bdefd8b..16b66f5bd 100644 --- a/.github/workflows/ghcr-retention.yml +++ b/.github/workflows/ghcr-retention.yml @@ -19,4 +19,4 @@ jobs: org-name: goauthentik untagged-only: false token: ${{ secrets.GHCR_CLEANUP_TOKEN }} - skip-tags: gh-next,gh-master + skip-tags: gh-next,gh-main diff --git a/.github/workflows/translation-compile.yml b/.github/workflows/translation-compile.yml index 7b6b046d6..4d4158150 100644 --- a/.github/workflows/translation-compile.yml +++ b/.github/workflows/translation-compile.yml @@ -1,7 +1,7 @@ name: authentik-backend-translate-compile on: push: - branches: [ master ] + branches: [ main ] paths: - '/locale/' pull_request: diff --git a/.github/workflows/web-api-publish.yml b/.github/workflows/web-api-publish.yml index adcb9a2fc..1ae6e7fd3 100644 --- a/.github/workflows/web-api-publish.yml +++ b/.github/workflows/web-api-publish.yml @@ -1,7 +1,7 @@ name: authentik-web-api-publish on: push: - branches: [ master ] + branches: [ main ] paths: - 'schema.yml' workflow_dispatch: diff --git a/README.md b/README.md index 45cc10edb..5a89d9bf9 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/goauthentik/authentik/authentik-ci-outpost?label=outpost%20build&style=for-the-badge)](https://github.com/goauthentik/authentik/actions/workflows/ci-outpost.yml) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/goauthentik/authentik/authentik-ci-web?label=web%20build&style=for-the-badge)](https://github.com/goauthentik/authentik/actions/workflows/ci-web.yml) [![Code Coverage](https://img.shields.io/codecov/c/gh/goauthentik/authentik?style=for-the-badge)](https://codecov.io/gh/goauthentik/authentik) -[![Testspace tests](https://img.shields.io/testspace/total/goauthentik/goauthentik:authentik/master?style=for-the-badge)](https://goauthentik.testspace.com/) +[![Testspace tests](https://img.shields.io/testspace/total/goauthentik/goauthentik:authentik/main?style=for-the-badge)](https://goauthentik.testspace.com/) ![Docker pulls](https://img.shields.io/docker/pulls/beryju/authentik.svg?style=for-the-badge) ![Latest version](https://img.shields.io/docker/v/beryju/authentik?sort=semver&style=for-the-badge) [![](https://img.shields.io/badge/Help%20translate-transifex-blue?style=for-the-badge)](https://www.transifex.com/beryjuorg/authentik/) diff --git a/authentik/root/settings.py b/authentik/root/settings.py index eb8d0d577..a374ef8b4 100644 --- a/authentik/root/settings.py +++ b/authentik/root/settings.py @@ -152,7 +152,7 @@ SPECTACULAR_SETTINGS = { "AUTHENTICATION_WHITELIST": ["authentik.api.authentication.TokenAuthentication"], "LICENSE": { "name": "GNU GPLv3", - "url": "https://github.com/goauthentik/authentik/blob/master/LICENSE", + "url": "https://github.com/goauthentik/authentik/blob/main/LICENSE", }, "ENUM_NAME_OVERRIDES": { "EventActions": "authentik.events.models.EventAction", diff --git a/schema.yml b/schema.yml index 0c644ebff..d33a987d4 100644 --- a/schema.yml +++ b/schema.yml @@ -7,7 +7,7 @@ info: email: hello@goauthentik.io license: name: GNU GPLv3 - url: https://github.com/goauthentik/authentik/blob/master/LICENSE + url: https://github.com/goauthentik/authentik/blob/main/LICENSE paths: /admin/apps/: get: diff --git a/tests/e2e/utils.py b/tests/e2e/utils.py index cce9aab5c..1eb5bf33d 100644 --- a/tests/e2e/utils.py +++ b/tests/e2e/utils.py @@ -37,7 +37,7 @@ def get_docker_tag() -> str: """Get docker-tag based off of CI variables""" env_pr_branch = "GITHUB_HEAD_REF" default_branch = "GITHUB_REF" - branch_name = os.environ.get(default_branch, "master") + branch_name = os.environ.get(default_branch, "main") if os.environ.get(env_pr_branch, "") != "": branch_name = os.environ[env_pr_branch] branch_name = branch_name.replace("refs/heads/", "").replace("/", "-") @@ -66,9 +66,9 @@ class SeleniumTestCase(StaticLiveServerTestCase): self.container = self._start_container(specs) def get_container_image(self, base: str) -> str: - """Try to pull docker image based on git branch, fallback to master if not found.""" + """Try to pull docker image based on git branch, fallback to main if not found.""" client: DockerClient = from_env() - image = f"{base}:gh-master" + image = f"{base}:gh-main" try: branch_image = f"{base}:{get_docker_tag()}" client.images.pull(branch_image) diff --git a/web/security.txt b/web/security.txt index 5cb6fcb35..2ba75e931 100644 --- a/web/security.txt +++ b/web/security.txt @@ -1,4 +1,4 @@ Contact: mailto:security@goauthentik.io Expires: Sat, 1 Jan 2023 00:00 +0200 Preferred-Languages: en, de -Policy: https://github.com/goauthentik/authentik/blob/master/SECURITY.md +Policy: https://github.com/goauthentik/authentik/blob/main/SECURITY.md diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js index ccd54b901..94c8ad397 100644 --- a/website/docusaurus.config.js +++ b/website/docusaurus.config.js @@ -108,7 +108,7 @@ module.exports = { id: "docs", sidebarPath: require.resolve("./sidebars.js"), editUrl: - "https://github.com/goauthentik/authentik/edit/master/website/", + "https://github.com/goauthentik/authentik/edit/main/website/", }, theme: { customCss: require.resolve("./src/css/custom.css"), @@ -125,7 +125,7 @@ module.exports = { routeBasePath: "integrations", sidebarPath: require.resolve("./sidebarsIntegrations.js"), editUrl: - "https://github.com/goauthentik/authentik/edit/master/website/", + "https://github.com/goauthentik/authentik/edit/main/website/", }, ], [ @@ -136,7 +136,7 @@ module.exports = { routeBasePath: "developer-docs", sidebarPath: require.resolve("./sidebarsDev.js"), editUrl: - "https://github.com/goauthentik/authentik/edit/master/website/", + "https://github.com/goauthentik/authentik/edit/main/website/", }, ], ], diff --git a/website/docusaurus.docs-only.js b/website/docusaurus.docs-only.js index 06ce8c01f..7908e34ee 100644 --- a/website/docusaurus.docs-only.js +++ b/website/docusaurus.docs-only.js @@ -58,7 +58,7 @@ module.exports = { id: "docs", sidebarPath: require.resolve("./sidebars.js"), editUrl: - "https://github.com/goauthentik/authentik/edit/master/website/", + "https://github.com/goauthentik/authentik/edit/main/website/", }, pages: false, theme: { @@ -76,7 +76,7 @@ module.exports = { routeBasePath: "integrations", sidebarPath: require.resolve("./sidebarsIntegrations.js"), editUrl: - "https://github.com/goauthentik/authentik/edit/master/website/", + "https://github.com/goauthentik/authentik/edit/main/website/", }, ], [ @@ -87,7 +87,7 @@ module.exports = { routeBasePath: "developer-docs", sidebarPath: require.resolve("./sidebarsDev.js"), editUrl: - "https://github.com/goauthentik/authentik/edit/master/website/", + "https://github.com/goauthentik/authentik/edit/main/website/", }, ], [ diff --git a/website/integrations/services/gitea/index.md b/website/integrations/services/gitea/index.md index 605c411e4..675c5f722 100644 --- a/website/integrations/services/gitea/index.md +++ b/website/integrations/services/gitea/index.md @@ -60,7 +60,7 @@ Change the following fields - OAuth2 Provider: OpenID Connect - Client ID (Key): Step 1 - Client Secret: Step 1 -- Icon URL: https://raw.githubusercontent.com/goauthentik/authentik/master/web/icons/icon.png +- Icon URL: https://goauthentik.io/img/icon.png - OpenID Connect Auto Discovery URL: https://authentik.company/application/o/gitea-slug/.well-known/openid-configuration - Additional Scopes: `email profile`