From cc596184006cb9dbd5c917a68a660e48f0a6d5bc Mon Sep 17 00:00:00 2001 From: Guillem Gari Date: Tue, 3 Sep 2024 14:31:21 +0200 Subject: [PATCH] test in run --- .github/workflows/test.yaml | 14 +++++++------- setup-container/templates/_dockerfile.tpl | 2 -- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 05e4989..f01f228 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -62,14 +62,14 @@ jobs: yq e '.images.version = env(VERSION)' -i setup-container.yaml yq e '.images.sites.local = "robotnik"' -i setup-container.yaml setup-container/scripts/setup.sh - # - name: Build container image - - name: run ROS workspace tests + - name: Build container image + # - name: run ROS workspace tests if: steps.check_changes.outputs.has_changes == 'true' run: | cd container/test docker compose build - # - name: Run ROS workspace tests - # if: steps.check_changes.outputs.has_changes == 'true' - # run: | - # cd container/test - # docker compose up --exit-code-from container + - name: Run ROS workspace tests + if: steps.check_changes.outputs.has_changes == 'true' + run: | + cd container/test + docker compose up --exit-code-from container diff --git a/setup-container/templates/_dockerfile.tpl b/setup-container/templates/_dockerfile.tpl index 89d0279..87768df 100644 --- a/setup-container/templates/_dockerfile.tpl +++ b/setup-container/templates/_dockerfile.tpl @@ -148,8 +148,6 @@ FROM builder-base as test RUN compile_workspace.sh -RUN test_workspace.sh - FROM builder-base as builder RUN generate_debs.sh