From 4781be65003c61e58e2bf0b6cec878abe8607455 Mon Sep 17 00:00:00 2001 From: minottic Date: Mon, 21 Oct 2024 13:19:13 +0200 Subject: [PATCH] Revert non-next changes --- .github/workflows/scicat-be.yml | 22 +++++++++---------- frontend | 2 +- helm/configs/frontend/development/config.json | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/scicat-be.yml b/.github/workflows/scicat-be.yml index 2c1fb3f..236d7d2 100644 --- a/.github/workflows/scicat-be.yml +++ b/.github/workflows/scicat-be.yml @@ -1,13 +1,13 @@ name: scicat-be -on: - workflow_dispatch: +on: + workflow_dispatch: inputs: submodule_commit: - description: 'Commit of the submodule to deploy' + description: 'Commit of the submodule to deploy' required: false - commit: - description: 'Commit of the CI repo to deploy' + commit: + description: 'Commit of the CI repo to deploy' required: false pull_request: branches: [ main ] @@ -18,17 +18,17 @@ on: jobs: - set_env: + set_env: uses: ./.github/workflows/reusable.environment.yml - with: + with: commit: ${{ github.event.inputs.commit }} submodule_commit: ${{ github.event.inputs.submodule_commit }} check_changed: needs: set_env uses: ./.github/workflows/reusable.changes.yml - with: - files: | + with: + files: | .github/workflows/scicat-be.yml helm/configs/backend/values.yaml helm/configs/backend/login-callbacks.js @@ -43,11 +43,11 @@ jobs: build_deploy_scicat_be: if: (needs.check_changed.outputs.changed == 'true' && !needs.set_env.outputs.component) || needs.set_env.outputs.component == 'be' - needs: + needs: - check_changed - set_env uses: ./.github/workflows/reusable.build-deploy.yml - with: + with: context: backend/. image_name: ${{ github.repository }}/be release_name: backend diff --git a/frontend b/frontend index 0e31b17..eaf807e 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 0e31b176b9dc9c1bfd9ebc7d6cc17a6cf3623363 +Subproject commit eaf807e507c8d35a009af27c594cc618681b0031 diff --git a/helm/configs/frontend/development/config.json b/helm/configs/frontend/development/config.json index 8c131d2..50df4f3 100644 --- a/helm/configs/frontend/development/config.json +++ b/helm/configs/frontend/development/config.json @@ -128,7 +128,7 @@ { "displayText": "PSI account", "displayImage": "../../../assets/images/keycloak_icon_256px.svg", - "authURL": "api/v3/auth/oidc" + "authURL": "auth/keycloak" } ], "helpMessages": {