From 1dd8cfaf48c55c51cb538e409f29910d279bbbd5 Mon Sep 17 00:00:00 2001 From: youben11 Date: Mon, 7 Mar 2022 11:28:10 +0100 Subject: [PATCH] ci: remove tests from macos job on PRs even when using the cache, the macos job on PR takes a lot of time, due to the hardware limitations causing execution to take so much time. So instead, we limit the macos job to the build to make sure it can compile, and only run the tests for macos on push events --- .github/workflows/continuous-integration.yml | 17 ++++++++++++++++- compiler/Makefile | 4 +++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 4526430ec..c93520806 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -173,24 +173,39 @@ jobs: key: ${{ runner.os }}-compilation-cache-${{ github.event.pull_request.base.sha }} - name: Get tmpdir path + if: github.event_name == 'push' id: tmpdir-path run: echo "::set-output name=TMPDIR_PATH::`echo $TMPDIR`" - name: KeySetCache + if: github.event_name == 'push' uses: actions/cache@v2 with: path: ${{ steps.tmpdir-path.outputs.TMPDIR_PATH }}/KeySetCache key: ${{ runner.os }}-KeySetCache-2022-03-03-7pm + # We do run test-check as part of the build, as they aren't that costly + # and will at least give minimum confidence that the compiler works in PRs - name: Build run: | cd compiler echo "Debug: ccache statistics (prior to the build):" ccache -s export CONCRETE_PROJECT=${{ github.workspace }}/concrete + make python-bindings build-tests test-check + echo "Debug: ccache statistics (after the build):" + ccache -s + + - name: Test + if: github.event_name == 'push' + run: | + cd compiler + echo "Debug: ccache statistics (prior to the tests):" + ccache -s + export CONCRETE_PROJECT=${{ github.workspace }}/concrete make install_runtime_lib make test - echo "Debug: ccache statistics (after the build):" + echo "Debug: ccache statistics (after the tests):" ccache -s BuildAndTestDF: diff --git a/compiler/Makefile b/compiler/Makefile index ec146987b..627060b64 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -143,8 +143,9 @@ build-end-to-end-jit-dfr: build-initialized build-end-to-end-jit-auto-parallelization: build-initialized cmake --build $(BUILD_DIR) --target end_to_end_jit_auto_parallelization -build-end-to-end-jit: build-end-to-end-jit-test build-end-to-end-jit-clear-tensor build-end-to-end-jit-encrypted-tensor build-end-to-end-jit-fhelinalg +build-end-to-end-jit: build-end-to-end-jit-test build-end-to-end-jit-clear-tensor build-end-to-end-jit-encrypted-tensor build-end-to-end-jit-fhe build-end-to-end-jit-fhelinalg build-end-to-end-jit-lambda +build-tests: build-end-to-end-jit build-support-unit-test build-testlib-unit-test test-end-to-end-jit-test: build-end-to-end-jit-test $(BUILD_DIR)/bin/end_to_end_jit_test @@ -237,6 +238,7 @@ generate_conv_op: test-end-to-end-jit-fhelinalg \ test-python \ test \ + build-tests \ add-deps \ file-check \ not \