Merge pull request #164 from lrineau/fix-ubuntu-dependencies

nicer Github action to build, test, and push our images
CGAL · Oct 16, 2024 · 9718eb2 · 9718eb2
2 parents 353c573 + d82644f
commit 9718eb2
Show file tree

Hide file tree

Showing 21 changed files with 20 additions and 297 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,21 +13,22 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        test_platform: ['ArchLinux','Debian-stable','Debian-testing','Fedora','Fedora-32','Fedora-rawhide','Ubuntu','Ubuntu-GCC-master']
+        test_platform: ['ArchLinux','Debian-stable','Debian-testing','Fedora','Fedora-32','Fedora-rawhide','Ubuntu']
       fail-fast: false
 
     steps:
     - name: Git checkout
       uses: actions/checkout@v4
 
     - name: Compile images
-      run: bash -x ./test.sh ${{ matrix.test_platform }}
+      run: bash ./test.sh ${{ matrix.test_platform }}
 
     - name: Push images
       run: |
+        [ -n "$ACTIONS_RUNNER_DEBUG" ] && set -x
         if ${{ github.event_name == 'push' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'}} && ${{ github.ref == 'refs/heads/master' }}; then
           docker login -u maxgimeno -p ${{ secrets.PASSWD }}
-          bash -x ./push.sh ${{ matrix.test_platform }}
+          bash ./push.sh ${{ matrix.test_platform }}
         else
           echo "Don't upload on pull_requests"
         fi
diff --git a/CentOS-7-ICC-2016-Release/Dockerfile b/CentOS-7-ICC-2016-Release/Dockerfile
diff --git a/CentOS-7-ICC-2016-Release/init.cmake b/CentOS-7-ICC-2016-Release/init.cmake
diff --git a/CentOS-7-ICC-2016/Dockerfile b/CentOS-7-ICC-2016/Dockerfile
diff --git a/CentOS-7-ICC-2016/init.cmake b/CentOS-7-ICC-2016/init.cmake
diff --git a/CentOS-7-ICC-Release/Dockerfile b/CentOS-7-ICC-Release/Dockerfile
diff --git a/CentOS-7-ICC-Release/init.cmake b/CentOS-7-ICC-Release/init.cmake
diff --git a/CentOS-7-ICC-beta/Dockerfile b/CentOS-7-ICC-beta/Dockerfile
diff --git a/CentOS-7-ICC-beta/config.cfg b/CentOS-7-ICC-beta/config.cfg
diff --git a/CentOS-7-ICC-beta/init.cmake b/CentOS-7-ICC-beta/init.cmake
diff --git a/CentOS-7-ICC-beta/intel.sh b/CentOS-7-ICC-beta/intel.sh
diff --git a/CentOS-7-ICC/Dockerfile b/CentOS-7-ICC/Dockerfile
diff --git a/CentOS-7-ICC/config.cfg b/CentOS-7-ICC/config.cfg
diff --git a/CentOS-7-ICC/init.cmake b/CentOS-7-ICC/init.cmake
diff --git a/CentOS-7-ICC/intel.sh b/CentOS-7-ICC/intel.sh
diff --git a/CentOS-7-Release/Dockerfile b/CentOS-7-Release/Dockerfile
diff --git a/CentOS-7-Release/init.cmake b/CentOS-7-Release/init.cmake
diff --git a/CentOS-7/Dockerfile b/CentOS-7/Dockerfile
diff --git a/CentOS-7/init.cmake b/CentOS-7/init.cmake
diff --git a/push.sh b/push.sh
@@ -2,6 +2,8 @@
 
 set -e
 
+[ -n "$ACTIONS_RUNNER_DEBUG" ] && set -x
+
 if [ "$1" = ArchLinux ]
 then
    docker push cgal/testsuite-docker:archlinux
@@ -12,26 +14,6 @@ then
    docker push cgal/testsuite-docker:archlinux-clang-cxx17-release
    docker push cgal/testsuite-docker:archlinux-clang-cxx20-release
    docker push cgal/testsuite-docker:archlinux-clang-release
-elif [ "$1" = CentOS-5 ]
-then
-   docker push cgal/testsuite-docker:centos5
-elif [ "$1" = CentOS-6 ]
-then
-   docker push cgal/testsuite-docker:centos6
-   docker push cgal/testsuite-docker:centos6-cxx11-boost157
-elif [ "$1" = CentOS-6-32 ]
-then
-   docker push cgal/testsuite-docker:centos6-32
-elif [ "$1" = CentOS-7-ICC-beta ]
-then
-  docker push cgal/testsuite-docker:centos7-icc-beta
-elif [ "$1" = CentOS-7-ICC ]
-then
-  docker push cgal/testsuite-docker:centos7-icc
-elif [ "$1" = CentOS-7 ]
-then
-   docker push cgal/testsuite-docker:centos7
-   docker push cgal/testsuite-docker:centos7-release
 elif [ "$1" = Debian-stable ]
 then
    docker push cgal/testsuite-docker:debian-stable
@@ -61,8 +43,6 @@ then
    docker push cgal/testsuite-docker:ubuntu-cxx11
    docker push cgal/testsuite-docker:ubuntu-no-deprecated-code
    docker push cgal/testsuite-docker:ubuntu-no-gmp-no-leda
-elif [ "$1" = Ubuntu-GCC-master ]
-then
    docker push cgal/testsuite-docker:ubuntu-gcc6
    docker push cgal/testsuite-docker:ubuntu-gcc6-cxx1z
    docker push cgal/testsuite-docker:ubuntu-gcc6-release