From 0f0b59237508b8853db562569a800a32c90c3c0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Dutheillet-Lamonth=C3=A9zie?= Date: Tue, 3 Sep 2024 17:01:46 +0200 Subject: [PATCH] #97: remove temporary workflow and non-working config --- .github/workflows/build-and-test-macos.yml | 7 -- .github/workflows/pushbasedockerimage_tmp.yml | 69 ------------------- 2 files changed, 76 deletions(-) delete mode 100644 .github/workflows/pushbasedockerimage_tmp.yml diff --git a/.github/workflows/build-and-test-macos.yml b/.github/workflows/build-and-test-macos.yml index e1db35221..6e173ce6e 100644 --- a/.github/workflows/build-and-test-macos.yml +++ b/.github/workflows/build-and-test-macos.yml @@ -32,13 +32,6 @@ jobs: gcov: llvm-gcov, python: ['3.8', '3.9', '3.10', '3.11', '3.12'], vtk: '9.3.1' - }, - { - base: macos-14, - compiler: { cc: gcc-13, cxx: g++-13 }, - gcov: gcov-13, - python: ['3.8', '3.9', '3.10', '3.11', '3.12'], - vtk: '9.3.1' } ] runs-on: ${{ matrix.host.base }} diff --git a/.github/workflows/pushbasedockerimage_tmp.yml b/.github/workflows/pushbasedockerimage_tmp.yml deleted file mode 100644 index c84797766..000000000 --- a/.github/workflows/pushbasedockerimage_tmp.yml +++ /dev/null @@ -1,69 +0,0 @@ -name: Build & push base Docker image (add ubuntu_24.04-gcc_12-vtk_9.3.1-py_3.8 image) - -on: - push: - branches: - - 97-add-more-environments-to-test-in-ci - -jobs: - push_to_registry: - name: Build & Push - runs-on: ubuntu-latest - env: - DOCKER_REPOSITORY: lifflander1/vt - strategy: - matrix: - image: [ ubuntu_24.04-gcc_13-vtk_9.3.1-py_3.8 ] - steps: - - name: Check out the repo - uses: actions/checkout@v4 - - - name: Extract build configuration - # If workflow dispatch event replace `matrix.image` by `inputs.image` - run: | - IFS='_-' read -r -a CONFIG <<< "${{ matrix.image }}" - echo "BASE_IMAGE=${CONFIG[0]}:${CONFIG[1]}" >> $GITHUB_ENV - echo "CC=${CONFIG[2]}-${CONFIG[3]}" >> $GITHUB_ENV - if [[ "${CONFIG[2]}" == "gcc" ]]; then - echo "CXX=g++-${CONFIG[3]}" >> $GITHUB_ENV - echo "GCOV=gcov-${CONFIG[3]}" >> $GITHUB_ENV - elif [[ "${CONFIG[2]}" == "clang" ]]; then - echo "CXX=clang++-${CONFIG[3]}" >> $GITHUB_ENV - echo "GCOV=gcov" >> $GITHUB_ENV - else - exit 1 - fi - echo "VTK_VERSION=${CONFIG[5]}" >> $GITHUB_ENV - echo "PYTHON_VERSION=${CONFIG[7]}" >> $GITHUB_ENV - echo "DOCKER_TAG=${{ matrix.image }}" >> $GITHUB_ENV - - - name: Build configuration - run: | - echo "Base image: $BASE_IMAGE" - echo "C Compiler: $CC" - echo "CXX Compiler: $CXX" - echo "GCOV: $GCOV" - echo "VTK: $VTK_VERSION" - echo "Python: $PYTHON_VERSION" - echo "Docker tag: $DOCKER_TAG" - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_TOKEN }} - - - name: Build and push to Docker Hub - uses: docker/build-push-action@v6 - with: - context: . - build-args: | - BASE_IMAGE=${{ env.BASE_IMAGE }} - CC=${{ env.CC }} - CXX=${{ env.CXX }} - GCOV=${{ env.GCOV }} - VTK_VERSION=${{ env.VTK_VERSION }} - PYTHON_VERSION=${{ env.PYTHON_VERSION }} - file: ci/docker/make-base-ubuntu.dockerfile - push: true - tags: "${{ env.DOCKER_REPOSITORY }}:${{ env.DOCKER_TAG }}"