@@ -68,14 +68,27 @@ jobs:
6868 echo "CONFIG_PATH=${{ matrix.config_path }}" >> "$GITHUB_ENV"
6969 echo "NON_STANDALONE=${{ matrix.non_standalone }}" >> "$GITHUB_ENV"
7070 echo "Load environment variables from config path..."
71- if [[ ! -f "${{ matrix.config_path }}/.env" ]]; then
72- echo "Creating .env from env in ${{ matrix.config_path }}"
73- cp "${{ matrix.config_path }}/env" "${{ matrix.config_path }}/.env"
71+ ENV_FILE="$GITHUB_WORKSPACE/${{ matrix.config_path }}/env"
72+ if [[ -f "$ENV_FILE" ]]; then
73+ if [[ ! -f "${{ matrix.config_path }}/.env" ]]; then
74+ echo "Creating .env from env in ${{ matrix.config_path }}"
75+ cp "$ENV_FILE" "$GITHUB_WORKSPACE/${{ matrix.config_path }}/.env"
76+ fi
77+ else
78+ ENV_FILE="$GITHUB_WORKSPACE/${{ matrix.config_path }}/envs/.env.database.elasticsearch"
79+ if [[ -f "$ENV_FILE" ]]; then
80+ echo "Using env file for 8.8: $ENV_FILE"
81+ echo "DATABASE=elasticsearch" >> "$GITHUB_ENV"
82+ else
83+ echo "No env file found in ${{ matrix.config_path }}"
84+ exit 1
85+ fi
7486 fi
87+ echo "ENV_FILE=$ENV_FILE" >> "$GITHUB_ENV"
7588 # Filter out comments and empty lines before adding to GITHUB_ENV
76- grep -v '^#' ${{ matrix.config_path }}/env | grep -v '^$' >> "$GITHUB_ENV"
89+ grep -v '^#' "$ENV_FILE" | grep -v '^$' >> "$GITHUB_ENV"
7790 echo "=== Loaded environment variables ==="
78- grep -v '^#' ${{ matrix.config_path }}/env | grep -v '^$'
91+ grep -v '^#' "$ENV_FILE" | grep -v '^$'
7992
8093 - name : Print env values
8194 run : |
@@ -108,7 +121,7 @@ jobs:
108121 echo $NON_STANDALONE
109122 if [[ "$NON_STANDALONE" == "true" ]]; then
110123 echo "Using single services for older branches (8.6/8.7)"
111- docker compose --env-file env up -d
124+ docker compose --env-file "$ENV_FILE" up -d
112125 else
113126 echo "Using standalone camunda container"
114127 if [[ "${{ matrix.tasklist_mode }}" == "v1" ]]; then
@@ -117,13 +130,13 @@ jobs:
117130 CAMUNDA_SECURITY_AUTHENTICATION_UNPROTECTEDAPI=true \
118131 CAMUNDA_SECURITY_AUTHORIZATIONS_ENABLED=false \
119132 CAMUNDA_SECURITY_AUTHENTICATION_METHOD=NONE \
120- DATABASE=elasticsearch docker compose --env-file env up -d camunda
133+ DATABASE=${DATABASE:- elasticsearch} docker compose --env-file "$ENV_FILE" up -d camunda
121134 else
122135 echo "Starting with default Tasklist V2 mode"
123136 CAMUNDA_SECURITY_AUTHENTICATION_UNPROTECTEDAPI=true \
124137 CAMUNDA_SECURITY_AUTHORIZATIONS_ENABLED=false \
125138 CAMUNDA_SECURITY_AUTHENTICATION_METHOD=NONE \
126- DATABASE=elasticsearch docker compose --env-file env up -d camunda
139+ DATABASE=${DATABASE:- elasticsearch} docker compose --env-file "$ENV_FILE" up -d camunda
127140 fi
128141 fi
129142 working-directory : ${{ env.CONFIG_PATH }}
@@ -371,7 +384,7 @@ jobs:
371384 - uses : actions/upload-artifact@v4
372385 if : always()
373386 with :
374- name : SAP BTP Plugin Fiori App (Tasklist ${{ matrix.tasklist_mode }} mode)
387+ name : SAP BTP Plugin Fiori App v${{ matrix.version }} (Tasklist ${{ matrix.tasklist_mode }} mode)
375388 path : |
376389 fiori-app/webapp/html-report
377390 fiori-app/webapp/test-results
0 commit comments