From 2d01fe7b7ab114443484a2b3ecd7cf7d53402297 Mon Sep 17 00:00:00 2001 From: "Thomas F. K. Jorna" Date: Tue, 4 Mar 2025 19:26:00 +0100 Subject: [PATCH] chore: restore correct builds --- .github/workflows/on_pr.yml | 10 +++++----- docker-compose.preview.yml | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/on_pr.yml b/.github/workflows/on_pr.yml index 4c942d78c..368480d85 100644 --- a/.github/workflows/on_pr.yml +++ b/.github/workflows/on_pr.yml @@ -35,8 +35,8 @@ jobs: permissions: write-all runs-on: ubuntu-latest timeout-minutes: 30 - # needs: - # - build-all + needs: + - build-all steps: - uses: actions/checkout@v4 @@ -45,9 +45,9 @@ jobs: - name: Configure pullpreview env: - PLATFORM_IMAGE: "" #${{ needs.build-all.outputs.core-image }} - JOBS_IMAGE: "" #${{ needs.build-all.outputs.jobs-image }} - MIGRATIONS_IMAGE: "" #${{ needs.build-all.outputs.base-image }} + PLATFORM_IMAGE: ${{ needs.build-all.outputs.core-image }} + JOBS_IMAGE: ${{ needs.build-all.outputs.jobs-image }} + MIGRATIONS_IMAGE: ${{ needs.build-all.outputs.base-image }} run: | sed -i "s|image: PLATFORM_IMAGE|image: $PLATFORM_IMAGE|" docker-compose.preview.yml sed -i "s|image: JOBS_IMAGE|image: $JOBS_IMAGE|" docker-compose.preview.yml diff --git a/docker-compose.preview.yml b/docker-compose.preview.yml index 2140d408b..2f8407a93 100644 --- a/docker-compose.preview.yml +++ b/docker-compose.preview.yml @@ -1,6 +1,6 @@ services: platform: - # image: PLATFORM_IMAGE + image: PLATFORM_IMAGE environment: POSTGRES_USER: preview POSTGRES_PASSWORD: preview @@ -22,10 +22,10 @@ services: MINIO_ROOT_PASSWORD: preview123 # volumes: # - ./minio:/data - # platform-jobs: - # image: JOBS_IMAGE + platform-jobs: + image: JOBS_IMAGE platform-migrations: - # image: MIGRATIONS_IMAGE + image: MIGRATIONS_IMAGE command: pnpm --filter core reset caddy: environment: