migrate to main (#3035)

closes #3032

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens L 2022-06-03 19:40:09 +02:00 committed by GitHub
parent 0c591a50e3
commit 36cbc44ed6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 28 additions and 28 deletions

View File

@ -1,7 +1,7 @@
<!-- <!--
👋 Hello there! Welcome. 👋 Hello there! Welcome.
Please check the [Contributing guidelines](https://github.com/goauthentik/authentik/blob/master/CONTRIBUTING.md#how-can-i-contribute). Please check the [Contributing guidelines](https://github.com/goauthentik/authentik/blob/main/CONTRIBUTING.md#how-can-i-contribute).
--> -->
# Details # Details

View File

@ -3,14 +3,14 @@ name: authentik-ci-main
on: on:
push: push:
branches: branches:
- master - main
- next - next
- version-* - version-*
paths-ignore: paths-ignore:
- website - website
pull_request: pull_request:
branches: branches:
- master - main
env: env:
POSTGRES_DB: authentik POSTGRES_DB: authentik

View File

@ -3,12 +3,12 @@ name: authentik-ci-outpost
on: on:
push: push:
branches: branches:
- master - main
- next - next
- version-* - version-*
pull_request: pull_request:
branches: branches:
- master - main
jobs: jobs:
lint-golint: lint-golint:

View File

@ -3,12 +3,12 @@ name: authentik-ci-web
on: on:
push: push:
branches: branches:
- master - main
- next - next
- version-* - version-*
pull_request: pull_request:
branches: branches:
- master - main
jobs: jobs:
lint-eslint: lint-eslint:

View File

@ -3,12 +3,12 @@ name: authentik-ci-website
on: on:
push: push:
branches: branches:
- master - main
- next - next
- version-* - version-*
pull_request: pull_request:
branches: branches:
- master - main
jobs: jobs:
lint-prettier: lint-prettier:

View File

@ -2,10 +2,10 @@ name: "CodeQL"
on: on:
push: push:
branches: [ master, '*', next, version* ] branches: [ main, '*', next, version* ]
pull_request: pull_request:
# The branches below must be a subset of the branches above # The branches below must be a subset of the branches above
branches: [ master ] branches: [ main ]
schedule: schedule:
- cron: '30 6 * * 5' - cron: '30 6 * * 5'

View File

@ -19,4 +19,4 @@ jobs:
org-name: goauthentik org-name: goauthentik
untagged-only: false untagged-only: false
token: ${{ secrets.GHCR_CLEANUP_TOKEN }} token: ${{ secrets.GHCR_CLEANUP_TOKEN }}
skip-tags: gh-next,gh-master skip-tags: gh-next,gh-main

View File

@ -1,7 +1,7 @@
name: authentik-backend-translate-compile name: authentik-backend-translate-compile
on: on:
push: push:
branches: [ master ] branches: [ main ]
paths: paths:
- '/locale/' - '/locale/'
pull_request: pull_request:

View File

@ -1,7 +1,7 @@
name: authentik-web-api-publish name: authentik-web-api-publish
on: on:
push: push:
branches: [ master ] branches: [ main ]
paths: paths:
- 'schema.yml' - 'schema.yml'
workflow_dispatch: workflow_dispatch:

View File

@ -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-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) [![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) [![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) ![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) ![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/) [![](https://img.shields.io/badge/Help%20translate-transifex-blue?style=for-the-badge)](https://www.transifex.com/beryjuorg/authentik/)

View File

@ -152,7 +152,7 @@ SPECTACULAR_SETTINGS = {
"AUTHENTICATION_WHITELIST": ["authentik.api.authentication.TokenAuthentication"], "AUTHENTICATION_WHITELIST": ["authentik.api.authentication.TokenAuthentication"],
"LICENSE": { "LICENSE": {
"name": "GNU GPLv3", "name": "GNU GPLv3",
"url": "https://github.com/goauthentik/authentik/blob/master/LICENSE", "url": "https://github.com/goauthentik/authentik/blob/main/LICENSE",
}, },
"ENUM_NAME_OVERRIDES": { "ENUM_NAME_OVERRIDES": {
"EventActions": "authentik.events.models.EventAction", "EventActions": "authentik.events.models.EventAction",

View File

@ -7,7 +7,7 @@ info:
email: hello@goauthentik.io email: hello@goauthentik.io
license: license:
name: GNU GPLv3 name: GNU GPLv3
url: https://github.com/goauthentik/authentik/blob/master/LICENSE url: https://github.com/goauthentik/authentik/blob/main/LICENSE
paths: paths:
/admin/apps/: /admin/apps/:
get: get:

View File

@ -37,7 +37,7 @@ def get_docker_tag() -> str:
"""Get docker-tag based off of CI variables""" """Get docker-tag based off of CI variables"""
env_pr_branch = "GITHUB_HEAD_REF" env_pr_branch = "GITHUB_HEAD_REF"
default_branch = "GITHUB_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, "") != "": if os.environ.get(env_pr_branch, "") != "":
branch_name = os.environ[env_pr_branch] branch_name = os.environ[env_pr_branch]
branch_name = branch_name.replace("refs/heads/", "").replace("/", "-") branch_name = branch_name.replace("refs/heads/", "").replace("/", "-")
@ -66,9 +66,9 @@ class SeleniumTestCase(StaticLiveServerTestCase):
self.container = self._start_container(specs) self.container = self._start_container(specs)
def get_container_image(self, base: str) -> str: 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() client: DockerClient = from_env()
image = f"{base}:gh-master" image = f"{base}:gh-main"
try: try:
branch_image = f"{base}:{get_docker_tag()}" branch_image = f"{base}:{get_docker_tag()}"
client.images.pull(branch_image) client.images.pull(branch_image)

View File

@ -1,4 +1,4 @@
Contact: mailto:security@goauthentik.io Contact: mailto:security@goauthentik.io
Expires: Sat, 1 Jan 2023 00:00 +0200 Expires: Sat, 1 Jan 2023 00:00 +0200
Preferred-Languages: en, de Preferred-Languages: en, de
Policy: https://github.com/goauthentik/authentik/blob/master/SECURITY.md Policy: https://github.com/goauthentik/authentik/blob/main/SECURITY.md

View File

@ -108,7 +108,7 @@ module.exports = {
id: "docs", id: "docs",
sidebarPath: require.resolve("./sidebars.js"), sidebarPath: require.resolve("./sidebars.js"),
editUrl: editUrl:
"https://github.com/goauthentik/authentik/edit/master/website/", "https://github.com/goauthentik/authentik/edit/main/website/",
}, },
theme: { theme: {
customCss: require.resolve("./src/css/custom.css"), customCss: require.resolve("./src/css/custom.css"),
@ -125,7 +125,7 @@ module.exports = {
routeBasePath: "integrations", routeBasePath: "integrations",
sidebarPath: require.resolve("./sidebarsIntegrations.js"), sidebarPath: require.resolve("./sidebarsIntegrations.js"),
editUrl: 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", routeBasePath: "developer-docs",
sidebarPath: require.resolve("./sidebarsDev.js"), sidebarPath: require.resolve("./sidebarsDev.js"),
editUrl: editUrl:
"https://github.com/goauthentik/authentik/edit/master/website/", "https://github.com/goauthentik/authentik/edit/main/website/",
}, },
], ],
], ],

View File

@ -58,7 +58,7 @@ module.exports = {
id: "docs", id: "docs",
sidebarPath: require.resolve("./sidebars.js"), sidebarPath: require.resolve("./sidebars.js"),
editUrl: editUrl:
"https://github.com/goauthentik/authentik/edit/master/website/", "https://github.com/goauthentik/authentik/edit/main/website/",
}, },
pages: false, pages: false,
theme: { theme: {
@ -76,7 +76,7 @@ module.exports = {
routeBasePath: "integrations", routeBasePath: "integrations",
sidebarPath: require.resolve("./sidebarsIntegrations.js"), sidebarPath: require.resolve("./sidebarsIntegrations.js"),
editUrl: 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", routeBasePath: "developer-docs",
sidebarPath: require.resolve("./sidebarsDev.js"), sidebarPath: require.resolve("./sidebarsDev.js"),
editUrl: editUrl:
"https://github.com/goauthentik/authentik/edit/master/website/", "https://github.com/goauthentik/authentik/edit/main/website/",
}, },
], ],
[ [

View File

@ -60,7 +60,7 @@ Change the following fields
- OAuth2 Provider: OpenID Connect - OAuth2 Provider: OpenID Connect
- Client ID (Key): Step 1 - Client ID (Key): Step 1
- Client Secret: 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 - OpenID Connect Auto Discovery URL: https://authentik.company/application/o/gitea-slug/.well-known/openid-configuration
- Additional Scopes: `email profile` - Additional Scopes: `email profile`