re-organize CI

koide3 · Jul 1, 2024 · 558f1d8 · 558f1d8
1 parent aebc11e
commit 558f1d8
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 126 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,16 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        DISTRO: [jammy, jammy_cuda11.8, jammy_llvm, jammy_cuda11.8_llvm]
+        DISTRO: [
+          { "ubuntu": "jammy", "suffix": ".gcc" },
+          { "ubuntu": "jammy", "suffix": ".llvm" },
+          { "ubuntu": "jammy_cuda11.8", "suffix": ".gcc.cuda" },
+          { "ubuntu": "jammy_cuda11.8", "suffix": ".llvm.cuda" },
+          { "ubuntu": "jammy_cuda12.2", "suffix": ".gcc.cuda" },
+          { "ubuntu": "jammy_cuda12.2", "suffix": ".llvm.cuda" },
+          { "ubuntu": "noble", "suffix": ".gcc" },
+          { "ubuntu": "noble", "suffix": ".llvm" }
+        ]
 
     steps:
       - uses: actions/checkout@v2
@@ -33,6 +42,8 @@ jobs:
       - name: Docker build
         uses: docker/build-push-action@v2
         with:
-          file: ${{github.workspace}}/docker/${{ matrix.DISTRO }}/Dockerfile
+          file: ${{github.workspace}}/docker/ubuntu/Dockerfile.${{ matrix.DISTRO.suffix }}
+          build-args: |
+            BASE_IMAGE=koide3/gtsam_docker:${{ matrix.DISTRO.ubuntu }}
           context: .
           push: false
diff --git a/docker/focal_cuda10.2/Dockerfile b/docker/focal_cuda10.2/Dockerfile
diff --git a/docker/focal_llvm/Dockerfile b/docker/focal_llvm/Dockerfile
diff --git a/docker/jammy/Dockerfile b/docker/jammy/Dockerfile
diff --git a/docker/jammy_cuda11.8/Dockerfile b/docker/jammy_cuda11.8/Dockerfile
diff --git a/docker/jammy_cuda11.8_llvm/Dockerfile b/docker/jammy_cuda11.8_llvm/Dockerfile
diff --git a/docker/focal/Dockerfile → docker/ubuntu/Dockerfile.gcc b/docker/focal/Dockerfile → docker/ubuntu/Dockerfile.gcc
@@ -1,4 +1,6 @@
-FROM koide3/gtsam_docker:focal
+ARG BASE_IMAGE=jammy
+
+FROM koide3/gtsam_docker:${BASE_IMAGE}
 
 COPY . /root/gtsam_points
 WORKDIR /root/gtsam_points/build

diff --git a/docker/focal_cuda11.2/Dockerfile → docker/ubuntu/Dockerfile.gcc.cuda b/docker/focal_cuda11.2/Dockerfile → docker/ubuntu/Dockerfile.gcc.cuda
@@ -1,14 +1,16 @@
-FROM koide3/gtsam_docker:focal_cuda11.2
+ARG BASE_IMAGE=jammy
+
+FROM koide3/gtsam_docker:${BASE_IMAGE}
 
 COPY . /root/gtsam_points
 WORKDIR /root/gtsam_points/build
 RUN rm -rf *
 RUN cmake .. \
   -DBUILD_DEMO=ON \
   -DBUILD_TESTS=ON \
+  -DBUILD_EXAMPLE=ON \
   -DBUILD_WITH_CUDA=ON \
   -DBUILD_WITH_CUDA_MULTIARCH=ON \
-  -DBUILD_EXAMPLE=ON \
   -DCMAKE_BUILD_TYPE=Release
 RUN make -j$(nproc)
 

diff --git a/docker/jammy_llvm/Dockerfile → docker/ubuntu/Dockerfile.llvm b/docker/jammy_llvm/Dockerfile → docker/ubuntu/Dockerfile.llvm
@@ -1,4 +1,6 @@
-FROM koide3/gtsam_docker:jammy
+ARG BASE_IMAGE=jammy
+
+FROM koide3/gtsam_docker:${BASE_IMAGE}
 
 RUN update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld 50
 

diff --git a/docker/focal_cuda11.2_llvm/Dockerfile → docker/ubuntu/Dockerfile.llvm.cuda b/docker/focal_cuda11.2_llvm/Dockerfile → docker/ubuntu/Dockerfile.llvm.cuda
@@ -1,4 +1,6 @@
-FROM koide3/gtsam_docker:focal_cuda11.2
+ARG BASE_IMAGE=jammy
+
+FROM koide3/gtsam_docker:${BASE_IMAGE}
 
 RUN update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld 50