Skip to content

Commit

Permalink
Revert non-next changes
Browse files Browse the repository at this point in the history
  • Loading branch information
minottic committed Oct 21, 2024
1 parent 961fe08 commit 4781be6
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/scicat-be.yml
Original file line number Diff line number Diff line change
@@ -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 ]
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion frontend
Submodule frontend updated 635 files
2 changes: 1 addition & 1 deletion helm/configs/frontend/development/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
{
"displayText": "PSI account",
"displayImage": "../../../assets/images/keycloak_icon_256px.svg",
"authURL": "api/v3/auth/oidc"
"authURL": "auth/keycloak"
}
],
"helpMessages": {
Expand Down

0 comments on commit 4781be6

Please sign in to comment.