refactor ci

.github/workflows/block_merge.yml → .github/workflows/commit_compliance.yml

@@ -1,13 +1,10 @@
-# Check commit and PR compliance
-name: Check commit message compliance
+name: check commit compliance
 on:
   pull_request:
-    types: [opened, synchronize, reopened]
 
 jobs:
-  check-commit-pr:
-    name: Check commit and PR
-    runs-on: ubuntu-20.04
+  format:
+    runs-on: ubuntu-latest
     steps:
       - name: Check first line
         uses: gsactions/commit-message-checker@16fa2d5de096ae0d35626443bcd24f1e756cafee # v2.0.0
@@ -19,3 +16,18 @@ jobs:
           excludeTitle: 'true' # optional: this excludes the title of a pull request
           checkAllCommitMessages: 'true' # optional: this checks all commits associated with a pull request
           accessToken: ${{ secrets.GITHUB_TOKEN }} # github access token is only required if checkAllCommitMessages is true
+
+  signatures:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check commit signatures
+        uses: 1Password/check-signed-commits-action@ed2885f3ed2577a4f5d3c3fe895432a557d23d52
+
+  linelint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - name: Linelint
+        uses: fernandrone/[email protected]
+        id: linelint

.github/workflows/concrete_python_test_macos.yml

@@ -1,138 +1,118 @@
-name: Concrete Python Tests (macOS)
+name: concrete-python tests macos
 on:
-  workflow_call:
   workflow_dispatch:
-    secrets:
-      CONCRETE_CI_SSH_PRIVATE:
-        required: true
-      CONCRETE_ACTIONS_TOKEN:
-        required: true
+  pull_request:
+    path:
+      - .github/workflows/concrete_python_tests_macos.yml
+  push:
+    branches:
+      - 'main'
+      - 'release/*'
 
 concurrency:
-  group: concrete_python_tests_macos-${{ github.ref }}
+  group: concrete_python_tests_macos_${{ github.ref }}
   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
-  BuildConcreteCompilerAndTestConcretePythonInMacOS:
+  concrete-python-test-pytest:
     strategy:
       fail-fast: false
       matrix:
         machine: ["aws-mac1-metal", "aws-mac2-metal"]
-
     runs-on: ${{ matrix.machine }}
     steps:
-      - name: Checkout
+      - name: Checkout concrete
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           submodules: recursive
-          token: ${{ secrets.CONCRETE_ACTIONS_TOKEN }}
-
-      - name: Install OS Dependencies
+          fetch-depth: 0
+      - name: Install build dependencies
         run: |
           brew install ninja ccache
-
       - name: Setup rust toolchain for concrete-cpu
         uses: ./.github/workflows/setup_rust_toolchain_for_concrete_cpu
-
-      - name: Cache Compilation (push)
+      - name: Cache compilation (push)
         if: github.event_name == 'push'
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
         with:
           path: /Users/runner/Library/Caches/ccache
           key: ${{ runner.os }}-${{ runner.arch }}-compilation-cache-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-${{ runner.arch }}-compilation-cache-
-
-      - name: Cache Compilation (pull_request)
+      - name: Cache compilation (pull_request)
         if: github.event_name == 'pull_request'
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
         with:
           path: /Users/runner/Library/Caches/ccache
           key: ${{ runner.os }}-${{ runner.arch }}-compilation-cache-${{ github.event.pull_request.base.sha }}
           restore-keys: |
             ${{ runner.os }}-${{ runner.arch }}-compilation-cache-
-
-      - name: Get tmpdir path
-        if: github.event_name == 'push'
-        id: tmpdir-path
-        run: echo "::set-output name=TMPDIR_PATH::$TMPDIR"
-
-      - name: Build
+      - name: Prepare build environment
         run: |
           set -e
-          cd frontends/concrete-python
-          
+          cd $GITHUB_WORKSPACE/frontends/concrete-python
+
           # Setup pkg-config to find OpenBLAS (scipy need it)
           export PKG_CONFIG_PATH="/opt/homebrew/opt/openblas/lib/pkgconfig"
-          
+
           rm -rf .venv
           python3.10 -m venv .venv
-          
-          . .venv/bin/activate
-          
+
+          . $GITHUB_WORKSPACE/frontends/concrete-python/.venv/bin/activate
+
           pip install -r requirements.dev.txt
           pip install -r requirements.txt
-          
+      - name: Build concrete-compiler python-bindings
+        run: |
+          $GITHUB_WORKSPACE/frontends/concrete-python .venv/bin/activate
           cd $GITHUB_WORKSPACE/compilers/concrete-compiler/compiler
-          
-          echo "Debug: ccache statistics (prior to the build):"
-          ccache -s
-          
+          ccache -z
           make Python3_EXECUTABLE=$(which python) python-bindings
-          
-          echo "Debug: ccache statistics (after the build):"
           ccache -s
-          
-          export COMPILER_BUILD_DIRECTORY=$(pwd)/build
+      - name: Create wheels
+        run: |
+          $GITHUB_WORKSPACE/frontends/concrete-python .venv/bin/activate
           cd $GITHUB_WORKSPACE/frontends/concrete-python
-          
-          rm -rf dist
-          mkdir -p dist
-          
+
+          export COMPILER_BUILD_DIRECTORY=$GITHUB_WORKSPACE/compilers/concrete-compiler/compiler
+          rm -rf dist && mkdir -p dist
           pip wheel -v --no-deps -w dist .
           delocate-wheel -v dist/*macos*.whl
-          
-          deactivate
 
+          deactivate
       - name: Prepare test environment
         run: |
           set -e
           export TEST_TMP_DIR=$(mktemp -d)
           echo "TEST_TMP_DIR=$TEST_TMP_DIR" >> "${GITHUB_ENV}"
           cd $TEST_TMP_DIR
-          
+
           python3.10 -m venv .testenv
           . .testenv/bin/activate
-          
+
           pip install $GITHUB_WORKSPACE/frontends/concrete-python/dist/*macos*.whl
           pip install -r $GITHUB_WORKSPACE/frontends/concrete-python/requirements.dev.txt
 
           # MacOS x86 have conflict between our OpenMP library, and one from torch
           # we fix it by using a single one (from torch)
           # see discussion: https://discuss.python.org/t/conflicting-binary-extensions-in-different-packages/25332/8
-          
+
           find .testenv/lib/python3.10/site-packages -not \( -path .testenv/lib/python3.10/site-packages/concrete -prune \) -name 'lib*omp5.dylib' -or -name 'lib*omp.dylib' | xargs -n 1  ln -f -s $(pwd)/.testenv/lib/python3.10/site-packages/concrete/.dylibs/libomp.dylib
 
           cp -R $GITHUB_WORKSPACE/frontends/concrete-python/examples ./examples
           cp -R $GITHUB_WORKSPACE/frontends/concrete-python/tests ./tests
-          
-          cp $GITHUB_WORKSPACE/frontends/concrete-python/Makefile .
 
-      - name: Test
+          cp $GITHUB_WORKSPACE/frontends/concrete-python/Makefile .
+      - name: Run pytest-macos
         run: |
-
           set -e
-          export TEST_TMP_DIR="testing_concrete_python"
           cd $TEST_TMP_DIR && . .testenv/bin/activate
           KEY_CACHE_DIRECTORY=./KeySetCache PYTEST_MARKERS="not dataflow and not graphviz" make pytest-macos
-
-      - name: Test notebooks
+      - name: Run test-notebooks
         run: |
           set -e
-          export TEST_TMP_DIR="testing_concrete_python"
           cd $TEST_TMP_DIR && . .testenv/bin/activate
           make test-notebooks
-
       - name: Cleanup host
         if: success() || failure()
         run: |