sorting env var issues

Author: erikspears

.github/workflows/testing-wip.yml

@@ -16,6 +16,14 @@ on:
 jobs:
   wip-tests:
     runs-on: ubuntu-latest
+    env:
+      MSAL_CB_PORT: 8000
+      MSAL_HOST: localhost
+      MSAL_APP_ID: ${{ secrets.QA_MSAL_APP_ID }}
+      MSAL_TENANT_ID: ${{ secrets.QA_MSAL_TENANT_ID }}
+      QA_ADMIN_PW: ${{ secrets.QA_ADMIN_PW }}
+      QA_OPENAI_KEY: ${{ secrets.QA_OPENAI_KEY }}
+      OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
     steps:
       - name: Checkout the Code
         uses: actions/checkout@v4
@@ -26,18 +34,6 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Setup the Environment File
-        run: |
-          cat <<EOF > .env
-          SWIRL_TEST_HOST=localhost
-          MSAL_HOST=localhost
-          MSAL_CB_PORT=8000
-          MSAL_APP_ID=${{ secrets.QA_MSAL_APP_ID }}
-          MSAL_TENANT_ID=${{ secrets.QA_MSAL_TENANT_ID }}
-          QA_ADMIN_PW=${{ secrets.QA_ADMIN_PW }}
-          QA_OPENAI_KEY=${{ secrets.QA_OPENAI_KEY }}
-          EOF
-
       - name: Build and Start Application
         run: docker-compose -f docker-compose-build.yml up --build -d
 
@@ -58,7 +54,7 @@ jobs:
           echo "Application is ready."
 
       - name: Run the QA Suite
-        run: docker run --net=host --env-file .env -t swirlai/swirl-search-qa:automated-tests-develop sh -c "behave --tags=${{ github.event.inputs.behave_tags }}"
+        run: docker run --net=host -t swirlai/swirl-search-qa:automated-tests-develop sh -c "behave --tags=${{ github.event.inputs.behave_tags }}"
 
       - name: Cleanup Application Environment
         run: docker-compose -f docker-compose-build.yml down

docker-compose-build.yml

@@ -15,13 +15,12 @@ services:
             -e "s/<msal-host>/$MSAL_HOST/" > static/api/config/default &&
         python swirl.py start celery-worker celery-beats &&
         daphne -b 0.0.0.0 -p 8000 swirl_server.asgi:application'
-
     environment:
-      - MSAL_CB_PORT=${MSAL_CB_PORT}
-      - MSAL_HOST=${MSAL_HOST}
-      - MSAL_APP_ID=${MSAL_APP_ID}
-      - MSAL_TENANT_ID=${MSAL_TENANT_ID}
-      - OPENAI_API_KEY=${OPENAI_API_KEY}
+      MSAL_CB_PORT: $MSAL_CB_PORT
+      MSAL_HOST: $MSAL_HOST
+      MSAL_APP_ID: $MSAL_APP_ID
+      MSAL_TENANT_ID: $MSAL_TENANT_ID
+      OPENAI_API_KEY: $OPENAI_API_KEY
     depends_on:
       - redis