From c38bb6376fe97d734eb9263d77ff82f242fa5a4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=90=D0=B7=D0=BE?= =?UTF-8?q?=D0=B2=D1=86=D0=B5=D0=B2?= Date: Mon, 9 Dec 2024 00:34:07 +0300 Subject: [PATCH 1/3] update rights in ci steps --- .github/workflows/build_and_test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 3e49db2..1ba0113 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -50,10 +50,10 @@ jobs: jam-${{ runner.os }} - name: "Basic init" - run: ./.ci/scripts/init.sh + run: sudo ./.ci/scripts/init.sh - name: "Init all dependencies" - run: make init_all + run: sudo make init_all - name: "Configure" run: make configure From 890e3e9bf1ad7e6f884adf2999c15dd3471e32ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=90=D0=B7=D0=BE?= =?UTF-8?q?=D0=B2=D1=86=D0=B5=D0=B2?= Date: Mon, 9 Dec 2024 00:37:59 +0300 Subject: [PATCH 2/3] sudo for linux build --- .github/workflows/build_and_test.yaml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 1ba0113..01652f4 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -34,6 +34,7 @@ jobs: strategy: matrix: os: [ubuntu-24.04, macos-15] + fail-fast: false steps: - name: Checkout code uses: actions/checkout@v4 @@ -50,10 +51,17 @@ jobs: jam-${{ runner.os }} - name: "Basic init" - run: sudo ./.ci/scripts/init.sh - + run: | + if [[ $RUNNER_OS == "Linux" ]]; then + sudo ./.ci/scripts/init.sh + else + ./.ci/scripts/init.sh + fi + - name: "Init all dependencies" - run: sudo make init_all + run: | + make init_py + make init_vcpkg - name: "Configure" run: make configure From 4ebb4c4ff760f244b264e3f7198d3c37a23f1be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=90=D0=B7=D0=BE?= =?UTF-8?q?=D0=B2=D1=86=D0=B5=D0=B2?= Date: Mon, 9 Dec 2024 00:58:49 +0300 Subject: [PATCH 3/3] configure and build in one step --- .ci/.env | 2 +- .github/workflows/build_and_test.yaml | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.ci/.env b/.ci/.env index 89352b0..d17091b 100644 --- a/.ci/.env +++ b/.ci/.env @@ -30,5 +30,5 @@ MACOS_PACKAGES="make \ zip" CMAKE_VERSION=3.31.1 -VCPKG_FORCE_SYSTEM_BINARIES=1 DEBIAN_FRONTEND=noninteractive +#VCPKG_FORCE_SYSTEM_BINARIES=1 diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 01652f4..1a95ae7 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -19,7 +19,7 @@ on: env: USE_CACHE: ${{ github.event.inputs.use_cache || 'true' }} CACHE_VERSION: v01 - CACHE_PATHS: | + CACHE_PATH: | ~/.cargo ~/.hunter ~/.cache/pip @@ -28,6 +28,7 @@ env: .venv .build + jobs: build-and-test: runs-on: ${{ matrix.os }} @@ -38,13 +39,16 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 - + with: + submodules: true + fetch-depth: 0 + - name: "Restore cache dependencies" id: cache-restore if: ${{ env.USE_CACHE == 'true' }} uses: actions/cache/restore@v4 with: - path: ${{ env.CACHE_PATHS }} + path: ${{ env.CACHE_PATH }} key: jam-${{ runner.os }}-${{ github.job }}-${{ env.CACHE_VERSION }} restore-keys: | jam-${{ runner.os }}-${{ github.job }}