Skip to content

Commit 4ff7765

Browse files
committed
Fix CI
1 parent 5bf3a63 commit 4ff7765

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/compose_test.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ jobs:
5454
strategy:
5555
matrix:
5656
BE_VERSION: [v3, v4]
57-
JOBS_ENABLED: ['', true]
57+
ELASTIC_OR_JOBS_ENABLED: ['', true]
5858
ELASTIC_ENABLED: ['', true]
5959
LDAP_ENABLED: ['', true]
6060
steps:
6161
- uses: actions/checkout@v4
6262
- name: Test compose.yaml
6363
run: |-
64-
export JOBS_ENABLED=${{ matrix.JOBS_ENABLED }}
65-
export ELASTIC_ENABLED=${{ matrix.ELASTIC_ENABLED }}
64+
export JOBS_ENABLED=${{ matrix.matrix.ELASTIC_OR_JOBS_ENABLED }}
65+
export ELASTIC_ENABLED=${{ matrix.ELASTIC_OR_JOBS_ENABLED }}
6666
export LDAP_ENABLED=${{ matrix.LDAP_ENABLED }}
6767
export BE_VERSION=${{ matrix.BE_VERSION }}
6868
docker compose --profile '*' up --wait --wait-timeout 300

services/frontend/config/init.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ exclude_config () {
1010
}
1111

1212
[ "$BE_VERSION" = "v4" ] && exclude_config "v3.json"
13-
[ -n "$LDAP_ENABLED" ] && exclude_config "ldap.json"
13+
[ -z "$LDAP_ENABLED" ] && exclude_config "ldap.json"
1414

1515
# shellcheck disable=SC2086
1616
jq -s 'reduce .[] as $item ({}; . * $item)' $FILES > /usr/share/nginx/html/assets/config.json

0 commit comments

Comments
 (0)