From ddae9dc6e150d153665a87a799b0efc9ec22c491 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Mon, 4 Jul 2022 21:10:16 +0200 Subject: [PATCH 1/2] Revert "web: manage version via package.json" This reverts commit 022401b60ef7926c81214c83a4e515d3ddeedd7d. Signed-off-by: Jens Langhammer # Conflicts: # web/src/api/Sentry.ts # web/src/api/Users.ts --- .bumpversion.cfg | 2 +- web/package.json | 4 ++-- web/rollup.config.js | 13 +++++-------- web/src/constants.ts | 4 +--- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 0a2eb407b..8aef550c4 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -17,4 +17,4 @@ tag_name = version/{new_version} [bumpversion:file:internal/constants/constants.go] -[bumpversion:file:web/package.json] +[bumpversion:file:web/src/constants.ts] diff --git a/web/package.json b/web/package.json index 3f5c0c7ca..cd7001ee5 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { - "name": "@goauthentik/web", - "version": "2022.6.3", + "name": "authentik-web", + "version": "0.0.0", "private": true, "license": "GNU GPLv3", "scripts": { diff --git a/web/rollup.config.js b/web/rollup.config.js index 970fb0f3e..8e4ff033f 100644 --- a/web/rollup.config.js +++ b/web/rollup.config.js @@ -7,8 +7,6 @@ import copy from "rollup-plugin-copy"; import cssimport from "rollup-plugin-cssimport"; import { terser } from "rollup-plugin-terser"; -import pkg from "./package.json"; - const extensions = [".js", ".jsx", ".ts", ".tsx"]; export const resources = [ @@ -75,12 +73,6 @@ export const defaultOptions = { plugins: [ cssimport(), markdown(), - replace({ - "process.env.NODE_ENV": JSON.stringify(isProdBuild ? "production" : "development"), - "process.env.AK_API_BASE_PATH": JSON.stringify(apiBasePath), - "process.env.AK_VERSION": JSON.stringify(pkg.version), - "preventAssignment": true, - }), nodeResolve({ extensions, browser: true }), commonjs(), babel({ @@ -88,6 +80,11 @@ export const defaultOptions = { babelHelpers: "runtime", include: ["src/**/*"], }), + replace({ + "process.env.NODE_ENV": JSON.stringify(isProdBuild ? "production" : "development"), + "process.env.AK_API_BASE_PATH": JSON.stringify(apiBasePath), + "preventAssignment": true, + }), isProdBuild && terser(), ].filter((p) => p), watch: { diff --git a/web/src/constants.ts b/web/src/constants.ts index 30a799de2..e66700b9c 100644 --- a/web/src/constants.ts +++ b/web/src/constants.ts @@ -1,11 +1,9 @@ -// Placeholder, replaced by rollup; -export const VERSION = process.env.AK_VERSION; - export const SECONDARY_CLASS = "pf-m-secondary"; export const SUCCESS_CLASS = "pf-m-success"; export const ERROR_CLASS = "pf-m-danger"; export const PROGRESS_CLASS = "pf-m-in-progress"; export const CURRENT_CLASS = "pf-m-current"; +export const VERSION = "2022.6.3"; export const TITLE_DEFAULT = "authentik"; export const ROUTE_SEPARATOR = ";"; From f316a3000ba5588f693d2ae3d3c6cb9a5f5f6098 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Mon, 4 Jul 2022 21:10:20 +0200 Subject: [PATCH 2/2] release: 2022.7.1 --- .bumpversion.cfg | 4 ++-- authentik/__init__.py | 2 +- docker-compose.yml | 4 ++-- internal/constants/constants.go | 2 +- pyproject.toml | 2 +- schema.yml | 2 +- web/src/constants.ts | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 8aef550c4..1691fc0fa 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,9 +1,9 @@ [bumpversion] -current_version = 2022.6.3 +current_version = 2022.7.1 tag = True commit = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) -serialize = {major}.{minor}.{patch} +serialize = {major}.{minor}.{patch} message = release: {new_version} tag_name = version/{new_version} diff --git a/authentik/__init__.py b/authentik/__init__.py index c4a0520bf..e63210357 100644 --- a/authentik/__init__.py +++ b/authentik/__init__.py @@ -2,7 +2,7 @@ from os import environ from typing import Optional -__version__ = "2022.6.3" +__version__ = "2022.7.1" ENV_GIT_HASH_KEY = "GIT_BUILD_HASH" diff --git a/docker-compose.yml b/docker-compose.yml index cd2229469..ec317565f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: retries: 5 timeout: 3s server: - image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.6.3} + image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.7.1} restart: unless-stopped command: server environment: @@ -50,7 +50,7 @@ services: - "0.0.0.0:${AUTHENTIK_PORT_HTTP:-9000}:9000" - "0.0.0.0:${AUTHENTIK_PORT_HTTPS:-9443}:9443" worker: - image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.6.3} + image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.7.1} restart: unless-stopped command: worker environment: diff --git a/internal/constants/constants.go b/internal/constants/constants.go index d0d0f063a..7fd5ccc3a 100644 --- a/internal/constants/constants.go +++ b/internal/constants/constants.go @@ -29,4 +29,4 @@ func UserAgent() string { return fmt.Sprintf("authentik@%s", FullVersion()) } -const VERSION = "2022.6.3" +const VERSION = "2022.7.1" diff --git a/pyproject.toml b/pyproject.toml index e3a17c60e..55e2c49f3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -90,7 +90,7 @@ addopts = "-p no:celery --junitxml=unittest.xml" [tool.poetry] name = "authentik" -version = "2022.6.3" +version = "2022.7.1" description = "" authors = ["authentik Team "] diff --git a/schema.yml b/schema.yml index d7c9c53f2..bbcb58991 100644 --- a/schema.yml +++ b/schema.yml @@ -1,7 +1,7 @@ openapi: 3.0.3 info: title: authentik - version: 2022.6.3 + version: 2022.7.1 description: Making authentication simple. contact: email: hello@goauthentik.io diff --git a/web/src/constants.ts b/web/src/constants.ts index e66700b9c..967bd6121 100644 --- a/web/src/constants.ts +++ b/web/src/constants.ts @@ -3,7 +3,7 @@ export const SUCCESS_CLASS = "pf-m-success"; export const ERROR_CLASS = "pf-m-danger"; export const PROGRESS_CLASS = "pf-m-in-progress"; export const CURRENT_CLASS = "pf-m-current"; -export const VERSION = "2022.6.3"; +export const VERSION = "2022.7.1"; export const TITLE_DEFAULT = "authentik"; export const ROUTE_SEPARATOR = ";";