From 2f4b18ebbd3e9f1bddc2ae6ec85734c872f2ff26 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Mon, 23 Aug 2021 16:12:31 +0200 Subject: [PATCH 1/2] web: fix license for API Client Signed-off-by: Jens Langhammer --- Makefile | 1 - scripts/web_api_esm.py | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3ceb09e55..1759554a3 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,6 @@ gen-web: mkdir -p web/node_modules/@goauthentik/api python -m scripts.web_api_esm \cp -fv scripts/web_api_readme.md web-api/README.md - \cp -fv LICENSE web-api/LICENSE cd web-api && npm i \cp -rfv web-api/* web/node_modules/@goauthentik/api diff --git a/scripts/web_api_esm.py b/scripts/web_api_esm.py index d9ad1acd6..5400610d6 100644 --- a/scripts/web_api_esm.py +++ b/scripts/web_api_esm.py @@ -21,6 +21,7 @@ TSCONFIG_ESM = { with open("web-api/package.json", encoding="utf-8") as _package: package = loads(_package.read()) + package["license"] = "GPL-3.0-only" package["module"] = "./dist/esm/index.js" package["sideEffects"] = False package["scripts"]["build"] = "tsc && tsc --project tsconfig.esm.json" From 89f2967f6917c4cde24be1cbdb90100458cdb378 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Mon, 23 Aug 2021 16:21:27 +0200 Subject: [PATCH 2/2] ci: only run npm client push on master and version branches Signed-off-by: Jens Langhammer --- .github/workflows/web-api-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/web-api-publish.yml b/.github/workflows/web-api-publish.yml index 64d0f627a..e06fbb143 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, '*', next, version* ] + branches: [ master, version* ] paths: - 'schema.yml' jobs: