Latest Conan (faasm#265)

* Latest conan * New version * Use latest faabric base in container * fix: bump black version * fix: remove dangling references to mpi-native * fix: bump myst-parser version to fix build issues in the docs * conan: bump to latest protobuf * docker: fix apt update * fix: remove reference to mpi-native in release workflow file Co-authored-by: Carlos Segarra <[email protected]>
auto-ndp · May 20, 2022 · caa6f1c · caa6f1c
1 parent 53896e4
commit caa6f1c
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 61 deletions.
diff --git a/.env b/.env
@@ -1,4 +1,4 @@
-FAABRIC_VERSION=0.3.2
-FAABRIC_CLI_IMAGE=faasm/faabric:0.3.2
+FAABRIC_VERSION=0.3.3
+FAABRIC_CLI_IMAGE=faasm/faabric:0.3.3
 COMPOSE_PROJECT_NAME=faabric-dev
 CONAN_CACHE_MOUNT_SOURCE=./conan-cache/
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -32,31 +32,3 @@ jobs:
           context: .
           tags: faasm/faabric:${{ env.TAG_VERSION }}
           build-args: FAABRIC_VERSION=${{ env.TAG_VERSION }}
-
-  build-mpi-native:
-    needs: build-faabric
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Get the code"
-        uses: actions/checkout@v2
-      - name: "Get tag version"
-        run: echo "TAG_VERSION=${GITHUB_REF#refs/tags/v*}" >> $GITHUB_ENV
-      - name: "Print tag version"
-        run: echo ${{ env.TAG_VERSION }}
-      - name: "Set up QEMU"
-        uses: docker/setup-qemu-action@v1
-      - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v1
-      - name: "Log in to DockerHub"
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: "Build native MPI container"
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          file: docker/faabric-mpi-native.dockerfile
-          context: .
-          tags: faasm/faabric-mpi-native:${{ env.TAG_VERSION }}
-          build-args: FAABRIC_VERSION=${{ env.TAG_VERSION }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -16,7 +16,7 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     container:
-      image: faasm/faabric:0.3.2
+      image: faasm/faabric:0.3.3
     defaults:
       run:
         working-directory: /code/faabric
@@ -31,7 +31,7 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     container:
-      image: faasm/faabric:0.3.2
+      image: faasm/faabric:0.3.3
     defaults:
       run:
         working-directory: /code/faabric
@@ -47,7 +47,7 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     container:
-      image: faasm/faabric:0.3.2
+      image: faasm/faabric:0.3.3
     defaults:
       run:
         working-directory: /code/faabric
@@ -81,7 +81,7 @@ jobs:
       TSAN_OPTIONS: "verbosity=1:halt_on_error=1:suppressions=/code/faabric/thread-sanitizer-ignorelist.txt:history_size=7"
       UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1"
     container:
-      image: faasm/faabric:0.3.2
+      image: faasm/faabric:0.3.3
       options: --privileged
     defaults:
       run:
@@ -131,7 +131,7 @@ jobs:
       REDIS_QUEUE_HOST: redis
       REDIS_STATE_HOST: redis
     container:
-      image: faasm/faabric:0.3.2
+      image: faasm/faabric:0.3.3
     defaults:
       run:
         working-directory: /code/faabric

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.3.2
+0.3.3
diff --git a/cmake/ExternalProjects.cmake b/cmake/ExternalProjects.cmake
@@ -36,11 +36,12 @@ conan_cmake_configure(
         "cppzmq/4.8.1@#e0f26b0614b3d812815edc102ce0d881"
         "flatbuffers/2.0.0@#82f5d13594b370c3668bb8abccffc706"
         "hiredis/1.0.2@#297f55bf1e66f8b9c1dc0e7d35e705ab"
-        "protobuf/3.17.1@#12f6551f4a57bbd3bf38ff3aad6aaa7e"
+        "protobuf/3.20.0@#8e4de7081bea093469c9e6076149b2b4"
         "rapidjson/cci.20200410@#abe3eeacf36801901f6f6d82d124781a"
         "readerwriterqueue/1.0.5@#4232c2ff826eb41e33d8ad8efd3c4c4c"
         "spdlog/1.9.2@#3724602b7b7e843c5e0a687c45e279c9"
         "zeromq/4.3.4@#3b9b0de9c4509784dc92629f3aaf2fe4"
+        "zlib/1.2.12@#3b9e037ae1c615d045a06c67d88491ae"
     GENERATORS
         cmake_find_package
         cmake_paths

diff --git a/docker/faabric-base.dockerfile b/docker/faabric-base.dockerfile
@@ -8,9 +8,8 @@ RUN add-apt-repository -y -n "deb http://apt.llvm.org/focal/ llvm-toolchain-foca
 RUN add-apt-repository -y -n "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main"
 RUN add-apt-repository -y -n "deb https://apt.kitware.com/ubuntu/ focal main"
 RUN add-apt-repository -y -n ppa:ubuntu-toolchain-r/test
-RUN apt-get update
 
-RUN apt install -y \
+RUN apt update -y && apt install -y \
     autoconf \
     automake \
     build-essential \
@@ -50,7 +49,7 @@ RUN apt install -y \
     sudo \
     unzip
 
-RUN curl -s -L -o /tmp/conan-latest.deb https://github.com/conan-io/conan/releases/download/1.43.0/conan-ubuntu-64.deb && sudo dpkg -i /tmp/conan-latest.deb && rm -f /tmp/conan-latest.deb
+RUN curl -s -L -o /tmp/conan-latest.deb https://github.com/conan-io/conan/releases/download/1.48.1/conan-ubuntu-64.deb && sudo dpkg -i /tmp/conan-latest.deb && rm -f /tmp/conan-latest.deb
 
 # Update pip
 RUN pip install -U pip

diff --git a/docker/faabric.dockerfile b/docker/faabric.dockerfile
@@ -1,4 +1,4 @@
-FROM faasm/faabric-base:0.3.2
+FROM faasm/faabric-base:0.3.3
 ARG FAABRIC_VERSION
 
 # faabic-base image is not re-built often, so tag may be behind

diff --git a/docs/source/development.md b/docs/source/development.md
@@ -135,7 +135,6 @@ bumped version. It should appear in:
 - `VERSION`
 - `.env`
 - `.github/workflows/tests.yml`.
-- `mpi-native/mpi-native.env`
 
 Once done, commit and push, then run:
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,9 +1,9 @@
-black==21.12b0
+black==22.3.0
 breathe==4.32.0
 docker==5.0.3
 flake8==4.0.1
 invoke==1.6.0
-myst-parser==0.16.1
+myst-parser==0.17.2
 numpy==1.21.5
 PyGithub==1.55
 redis==4.1.0

diff --git a/tasks/container.py b/tasks/container.py
@@ -6,7 +6,6 @@
 
 FAABRIC_IMAGE_NAME = "faabric"
 FAABRIC_BASE_IMAGE_NAME = "faabric-base"
-MPI_NATIVE_IMAGE_NAME = "faabric-mpi-native"
 
 
 def _get_docker_tag(img_name):
@@ -66,14 +65,6 @@ def build_base(ctx, nocache=False, push=False):
     _do_container_build(FAABRIC_BASE_IMAGE_NAME, nocache=nocache, push=push)
 
 
-@task
-def build_mpi_native(ctx, nocache=False, push=False):
-    """
-    Build current native MPI container
-    """
-    _do_container_build(MPI_NATIVE_IMAGE_NAME, nocache=nocache, push=push)
-
-
 @task
 def push(ctx):
     """
@@ -88,11 +79,3 @@ def push_base(ctx):
     Push faabric's base container
     """
     _do_push(FAABRIC_BASE_IMAGE_NAME)
-
-
-@task
-def push_mpi_native(ctx):
-    """
-    Push current version of the native MPI container
-    """
-    _do_push(MPI_NATIVE_IMAGE_NAME)