From 63728e623d30d3025675a95591d2aecd46c8eca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Simonis?= Date: Mon, 28 Oct 2024 15:54:53 +0100 Subject: [PATCH] Revert "Add aste CI image" --- .github/workflows/aste-pr.yml | 12 ------------ .github/workflows/aste.yml | 23 ----------------------- .github/workflows/daily.yml | 22 ---------------------- ci-aste.dockerfile | 19 ------------------- makefile | 5 +---- 5 files changed, 1 insertion(+), 80 deletions(-) delete mode 100644 .github/workflows/aste-pr.yml delete mode 100644 .github/workflows/aste.yml delete mode 100644 .github/workflows/daily.yml delete mode 100644 ci-aste.dockerfile diff --git a/.github/workflows/aste-pr.yml b/.github/workflows/aste-pr.yml deleted file mode 100644 index ff53c06..0000000 --- a/.github/workflows/aste-pr.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: "Check ASTE" -on: - pull_request: - paths: - - 'ci-aste.dockerfile' - -jobs: - latest: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: make aste diff --git a/.github/workflows/aste.yml b/.github/workflows/aste.yml deleted file mode 100644 index d42b4b5..0000000 --- a/.github/workflows/aste.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: "Update ASTE" -on: - workflow_dispatch: - push: - branches: - - master - paths: - - 'ci-aste.dockerfile' - -jobs: - latest: - runs-on: ubuntu-latest - env: - image: aste - steps: - - uses: actions/checkout@v2 - - uses: docker/build-push-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USER }} - password: ${{ secrets.DOCKERHUB_PASS }} - dockerfile: "./ci-${{ env.image }}.dockerfile" - repository: precice/ci-${{ env.image }} - tags: latest diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml deleted file mode 100644 index bad63e1..0000000 --- a/.github/workflows/daily.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: "Daily Update" -on: - workflow_dispatch: - schedule: - - cron: '0 4 * * *' # preCICE nightly runs at 2am, this one two hours later - -jobs: - latest: - strategy: - matrix: - image: [aste] - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: docker/setup-buildx-action@v3 - - uses: docker/build-push-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USER }} - password: ${{ secrets.DOCKERHUB_PASS }} - dockerfile: "./ci-${{ matrix.image }}.dockerfile" - repository: precice/ci-${{ matrix.image }} - tags: latest diff --git a/ci-aste.dockerfile b/ci-aste.dockerfile deleted file mode 100644 index 96bc0d3..0000000 --- a/ci-aste.dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -# Dockerfile for building preCICE on ubuntu 22.04 - -FROM precice/precice:nightly - -RUN git clone --branch v9.3.0 https://gitlab.kitware.com/vtk/vtk.git vtk && \ - cd vtk && \ - mkdir build && \ - cd build && \ - cmake -DVTK_WRAP_PYTHON="ON" -DVTK_USE_MPI="ON" -DCMAKE_BUILD_TYPE=Release .. && \ - cmake --build . -j $(nproc) && \ - cmake --install . && \ - cd ../.. && \ - rm -rf vtk - -RUN apt-get -qq update && \ - apt-get install -qq -y python3-pip python3-jinja2 python3-scipy python3-sympy libmetis-dev time clang && \ - pip install -q --no-input --no-cache-dir --no-python-version-warning polars - -RUN echo 'export PYTHONPATH="${PYTHONPATH}:/usr/local/lib/python3.10/site-packages/"' > /etc/profile.d/99-vtk.sh diff --git a/makefile b/makefile index eab478b..7c189eb 100644 --- a/makefile +++ b/makefile @@ -1,6 +1,6 @@ ALL=archlinux centos7 fedora ubuntu-1804 ubuntu-2004 ubuntu-2204 ubuntu-2404 intel -BASEIMAGES=ubuntu:20.04 ubuntu:22.04 ubuntu:24.04 archlinux:latest fedora:latest intel/oneapi-hpckit:devel-ubuntu22.04 precice/precice:nightly +BASEIMAGES=ubuntu:20.04 ubuntu:22.04 ubuntu:24.04 archlinux:latest fedora:latest intel/oneapi-hpckit:devel-ubuntu22.04 .PHONY: $(ALL) @@ -30,9 +30,6 @@ ubuntu-2204: ubuntu-2404: docker build -t precice/ci-ubuntu-2404:latest -f ci-ubuntu-2404.dockerfile . -aste: - docker build -t precice/ci-aste:latest -f ci-aste.dockerfile . - # Pull updated versions of all base images pull: $(foreach img,$(BASEIMAGES),docker pull $(img);)