fix container

Signed-off-by: M. Fatih Cırıt <mfc@leodrive.ai>
autowarefoundation · Jun 6, 2024 · 7819f87 · 7819f87
1 parent 70df7cb
commit 7819f87
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/.github/actions/build-and-test/action.yaml b/.github/actions/build-and-test/action.yaml
@@ -1,12 +1,6 @@
 name: "Build and Test Action"
 description: "Reusable action for building and testing the repository"
 inputs:
-  container:
-    description: "Container to use for the build"
-    required: true
-  container-suffix:
-    description: "Suffix for the container"
-    required: true
   build-depends-repos:
     description: "Repositories for build dependencies"
     required: true

diff --git a/.github/workflows/build-and-test-cuda.yaml b/.github/workflows/build-and-test-cuda.yaml
@@ -10,6 +10,7 @@ on:
 jobs:
   build-and-test-cuda:
     runs-on: [self-hosted, linux, ARM64]
+    container: ${{ matrix.container }}${{ matrix.container-suffix }}
     strategy:
       fail-fast: false
       matrix:
@@ -28,7 +29,5 @@ jobs:
       - name: Build and Test
         uses: ./.github/actions/build-and-test
         with:
-          container: ${{ matrix.container }}
-          container-suffix: ${{ matrix.container-suffix }}
           build-depends-repos: ${{ matrix.build-depends-repos }}
           rosdistro: ${{ matrix.rosdistro }}
diff --git a/.github/workflows/build-and-test-daily-arm64.yaml b/.github/workflows/build-and-test-daily-arm64.yaml
@@ -10,6 +10,7 @@ on:
 jobs:
   build-and-test-daily-arm64:
     runs-on: [self-hosted, linux, ARM64]
+    container: ${{ matrix.container }}${{ matrix.container-suffix }}
     strategy:
       fail-fast: false
       matrix:
@@ -29,7 +30,5 @@ jobs:
       - name: Build and Test
         uses: ./.github/actions/build-and-test
         with:
-          container: ${{ matrix.container }}
-          container-suffix: ${{ matrix.container-suffix }}
           build-depends-repos: ${{ matrix.build-depends-repos }}
           rosdistro: ${{ matrix.rosdistro }}
diff --git a/.github/workflows/build-and-test-daily.yaml b/.github/workflows/build-and-test-daily.yaml
@@ -10,6 +10,7 @@ on:
 jobs:
   build-and-test-daily:
     runs-on: [self-hosted, linux, X64]
+    container: ${{ matrix.container }}${{ matrix.container-suffix }}
     strategy:
       fail-fast: false
       matrix:
@@ -29,7 +30,5 @@ jobs:
       - name: Build and Test
         uses: ./.github/actions/build-and-test
         with:
-          container: ${{ matrix.container }}
-          container-suffix: ${{ matrix.container-suffix }}
           build-depends-repos: ${{ matrix.build-depends-repos }}
           rosdistro: ${{ matrix.rosdistro }}