refactor: simplify APP_TAG assignment in release and test workflows

This commit is contained in:
Nawaz Dhandala
2025-11-26 10:58:19 +00:00
parent 203e9b8c39
commit b9597250ac
2 changed files with 10 additions and 10 deletions

View File

@@ -2186,7 +2186,7 @@ jobs:
- name: Start Server with version tag
run: |
export $(grep -v '^#' config.env | xargs)
export APP_TAG=${{needs.read-version.outputs.major_minor}}-build.${{needs.generate-build-number.outputs.build_number}}
export APP_TAG=${{needs.read-version.outputs.major_minor}}
docker compose up --remove-orphans -d
npm run status-check
- name: Wait for server to start
@@ -2195,13 +2195,13 @@ jobs:
run: |
set -euo pipefail
export $(grep -v '^#' config.env | xargs)
export APP_TAG=${{needs.read-version.outputs.major_minor}}-build.${{needs.generate-build-number.outputs.build_number}}
export APP_TAG=${{needs.read-version.outputs.major_minor}}
docker compose -f docker-compose.e2e.yml pull e2e
- name: Run E2E Tests. Run docker container e2e in docker compose file
run: |
set -euo pipefail
export $(grep -v '^#' config.env | xargs)
export APP_TAG=${{needs.read-version.outputs.major_minor}}-build.${{needs.generate-build-number.outputs.build_number}}
export APP_TAG=${{needs.read-version.outputs.major_minor}}
trap 'docker compose -f docker-compose.e2e.yml down -v || true' EXIT
if ! docker compose -f docker-compose.e2e.yml up --exit-code-from e2e --abort-on-container-exit e2e; then
docker compose -f docker-compose.e2e.yml logs e2e
@@ -2273,7 +2273,7 @@ jobs:
- name: Start Server with version tag
run: |
export $(grep -v '^#' config.env | xargs)
export APP_TAG=${{needs.read-version.outputs.major_minor}}-build.${{needs.generate-build-number.outputs.build_number}}
export APP_TAG=${{needs.read-version.outputs.major_minor}}
docker compose up --remove-orphans -d
npm run status-check
- name: Wait for server to start
@@ -2282,13 +2282,13 @@ jobs:
run: |
set -euo pipefail
export $(grep -v '^#' config.env | xargs)
export APP_TAG=${{needs.read-version.outputs.major_minor}}-build.${{needs.generate-build-number.outputs.build_number}}
export APP_TAG=${{needs.read-version.outputs.major_minor}}
docker compose -f docker-compose.e2e.yml pull e2e
- name: Run E2E Tests. Run docker container e2e in docker compose file
run: |
set -euo pipefail
export $(grep -v '^#' config.env | xargs)
export APP_TAG=${{needs.read-version.outputs.major_minor}}-build.${{needs.generate-build-number.outputs.build_number}}
export APP_TAG=${{needs.read-version.outputs.major_minor}}
trap 'docker compose -f docker-compose.e2e.yml down -v || true' EXIT
if ! docker compose -f docker-compose.e2e.yml up --exit-code-from e2e --abort-on-container-exit e2e; then
docker compose -f docker-compose.e2e.yml logs e2e

View File

@@ -1964,7 +1964,7 @@ jobs:
run: |
set -euo pipefail
export $(grep -v '^#' config.env | xargs)
export APP_TAG=${{needs.read-version.outputs.major_minor}}-test-build.${{needs.generate-build-number.outputs.build_number}}
export APP_TAG=${{needs.read-version.outputs.major_minor}}-test
npm run start
- name: Wait for server to start
run: bash ./Tests/Scripts/status-check.sh http://localhost
@@ -1976,7 +1976,7 @@ jobs:
on_retry_command: docker compose -f docker-compose.dev.yml down -v || true
command: |
export $(grep -v '^#' config.env | xargs)
export APP_TAG=${{needs.read-version.outputs.major_minor}}-test-build.${{needs.generate-build-number.outputs.build_number}}
export APP_TAG=${{needs.read-version.outputs.major_minor}}-test
docker compose -f docker-compose.dev.yml up --exit-code-from e2e --abort-on-container-exit e2e || (docker compose -f docker-compose.dev.yml logs e2e && exit 1)
- name: Upload test results
uses: actions/upload-artifact@v4
@@ -2046,7 +2046,7 @@ jobs:
run: |
set -euo pipefail
export $(grep -v '^#' config.env | xargs)
export APP_TAG=${{needs.read-version.outputs.major_minor}}-test-build.${{needs.generate-build-number.outputs.build_number}}
export APP_TAG=${{needs.read-version.outputs.major_minor}}-test
npm run start
- name: Wait for server to start
run: bash ./Tests/Scripts/status-check.sh http://localhost
@@ -2058,7 +2058,7 @@ jobs:
on_retry_command: docker compose -f docker-compose.dev.yml down -v || true
command: |
export $(grep -v '^#' config.env | xargs)
export APP_TAG=${{needs.read-version.outputs.major_minor}}-test-build.${{needs.generate-build-number.outputs.build_number}}
export APP_TAG=${{needs.read-version.outputs.major_minor}}-test
docker compose -f docker-compose.dev.yml up --exit-code-from e2e --abort-on-container-exit e2e || (docker compose -f docker-compose.dev.yml logs e2e && exit 1)
- name: Upload test results
uses: actions/upload-artifact@v4