From b9597250ac968d05c0d642936c8b97c294bc2fc2 Mon Sep 17 00:00:00 2001 From: Nawaz Dhandala Date: Wed, 26 Nov 2025 10:58:19 +0000 Subject: [PATCH] refactor: simplify APP_TAG assignment in release and test workflows --- .github/workflows/release.yml | 12 ++++++------ .github/workflows/test-release.yaml | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2b68a6648c..bffc62313e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 diff --git a/.github/workflows/test-release.yaml b/.github/workflows/test-release.yaml index 5e7a95329c..9706130ae6 100644 --- a/.github/workflows/test-release.yaml +++ b/.github/workflows/test-release.yaml @@ -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