diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
index b78500a2c..4f7cf5256 100644
--- a/.github/workflows/ci-main.yml
+++ b/.github/workflows/ci-main.yml
@@ -48,25 +48,38 @@ jobs:
- name: run migrations
run: poetry run python -m lifecycle.migrate
test-migrations-from-stable:
+ name: test-migrations-from-stable - PostgreSQL ${{ matrix.psql }}
runs-on: ubuntu-latest
- continue-on-error: true
+ strategy:
+ fail-fast: false
+ matrix:
+ psql:
+ - 12-alpine
+ - 15-alpine
+ - 16-alpine
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup authentik env
uses: ./.github/actions/setup
+ with:
+ postgresql_version: ${{ matrix.psql }}
- name: checkout stable
run: |
+ # Delete all poetry envs
+ rm -rf /home/runner/.cache/pypoetry
# Copy current, latest config to local
cp authentik/lib/default.yml local.env.yml
cp -R .github ..
cp -R scripts ..
- git checkout $(git describe --tags $(git rev-list --tags --max-count=1))
+ git checkout version/$(python -c "from authentik import __version__; print(__version__)")
rm -rf .github/ scripts/
mv ../.github ../scripts .
- name: Setup authentik env (ensure stable deps are installed)
uses: ./.github/actions/setup
+ with:
+ postgresql_version: ${{ matrix.psql }}
- name: run migrations to stable
run: poetry run python -m lifecycle.migrate
- name: checkout current code
@@ -76,11 +89,16 @@ jobs:
git reset --hard HEAD
git clean -d -fx .
git checkout $GITHUB_SHA
- poetry install
+ # Delete previous poetry env
+ rm -rf $(poetry env info --path)
- name: Setup authentik env (ensure latest deps are installed)
uses: ./.github/actions/setup
+ with:
+ postgresql_version: ${{ matrix.psql }}
- name: migrate to latest
- run: poetry run python -m lifecycle.migrate
+ run: |
+ poetry install
+ poetry run python -m lifecycle.migrate
test-unittest:
name: test-unittest - PostgreSQL ${{ matrix.psql }}
runs-on: ubuntu-latest
@@ -97,7 +115,7 @@ jobs:
- name: Setup authentik env
uses: ./.github/actions/setup
with:
- postgresql_tag: ${{ matrix.psql }}
+ postgresql_version: ${{ matrix.psql }}
- name: run unittest
run: |
poetry run make test
diff --git a/authentik/core/templates/base/skeleton.html b/authentik/core/templates/base/skeleton.html
index 50a40de66..85137cc42 100644
--- a/authentik/core/templates/base/skeleton.html
+++ b/authentik/core/templates/base/skeleton.html
@@ -13,7 +13,6 @@
{% block head_before %}
{% endblock %}
-
diff --git a/authentik/core/templates/login/base_full.html b/authentik/core/templates/login/base_full.html
index 4cbf5e8dc..c2dcd874b 100644
--- a/authentik/core/templates/login/base_full.html
+++ b/authentik/core/templates/login/base_full.html
@@ -6,6 +6,7 @@
{% block head_before %}
+
{% include "base/header_js.html" %}
{% endblock %}
diff --git a/web/src/common/styles/theme-dark.css b/web/src/common/styles/theme-dark.css
index 30cda084a..530a7c218 100644
--- a/web/src/common/styles/theme-dark.css
+++ b/web/src/common/styles/theme-dark.css
@@ -310,6 +310,12 @@ select[multiple] option:checked {
--pf-c-wizard__nav-link--before--BackgroundColor: transparent;
}
/* tree view */
+.pf-c-tree-view__node {
+ --pf-c-tree-view__node--Color: var(--ak-dark-foreground);
+}
+.pf-c-tree-view__node-toggle {
+ --pf-c-tree-view__node-toggle--Color: var(--ak-dark-foreground);
+}
.pf-c-tree-view__node:focus {
--pf-c-tree-view__node--focus--BackgroundColor: var(--ak-dark-background-light-ish);
}
diff --git a/web/src/user/UserInterface.ts b/web/src/user/UserInterface.ts
index fbd21d347..09b10d632 100644
--- a/web/src/user/UserInterface.ts
+++ b/web/src/user/UserInterface.ts
@@ -82,9 +82,9 @@ export class UserInterface extends Interface {
:host([theme="dark"]) .pf-c-page__header {
color: var(--ak-dark-foreground) !important;
}
- .pf-c-page__header-tools-item .fas,
- .pf-c-notification-badge__count,
- .pf-c-page__header-tools-group .pf-c-button {
+ :host([theme="light"]) .pf-c-page__header-tools-item .fas,
+ :host([theme="light"]) .pf-c-notification-badge__count,
+ :host([theme="light"]) .pf-c-page__header-tools-group .pf-c-button {
color: var(--ak-global--Color--100) !important;
}
.pf-c-page {
@@ -183,7 +183,7 @@ export class UserInterface extends Interface {