try fix ci

Signed-off-by: turuslan <[email protected]>
libp2p · Apr 3, 2024 · c1d251d · c1d251d
1 parent e7619d1
commit c1d251d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,11 +13,12 @@ jobs:
     runs-on: macos-14
     steps:
     - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
+    - name: venv
+      run: python3 -m venv --upgrade-deps ~/venv && housekeeping/github_venv.sh $_
     - name: install
       run: |
-        python3 -m pip install --upgrade pip
-        python3 -m pip install scikit-build
-        python3 -m pip install cmake==3.25 requests gitpython gcovr
+        pip3 install scikit-build
+        pip3 install cmake==3.25 requests gitpython gcovr
         brew install ninja
     - name: cmake
       env:
@@ -38,19 +39,18 @@ jobs:
         compiler: [{
           "cc": "gcc",
           "cxx": "g++"
-         }, {
+        }, {
           "cc": "clang",
           "cxx": "clang++"
         }]
     steps:
-    - name: venv
-      run: ./housekeeping/github_venv.sh
     - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
+    - name: venv
+      run: housekeeping/github_venv.sh /venv/bin/activate
     - name: cmake
       env:
         CC: ${{ matrix.compiler.cc }}
         CXX: ${{ matrix.compiler.cxx }}
-      shell: bash
       run: cmake -B build .
     - name: build
       run: cmake --build build -- -j4

diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
@@ -13,19 +13,15 @@ jobs:
     runs-on: ubuntu-latest
     container: qdrvm/kagome-dev@sha256:2d70246c32418a3dd45c246d3f5c2dd99bdafde145b903271849affe476c4cfc
     steps:
-    - uses: actions/checkout@v1
-      name: checkout
-      with:
-        submodules: true
-        clean: true
-        fetch-depth: 1
+    - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
+    - name: venv
+      run: housekeeping/github_venv.sh /venv/bin/activate
     - name: run checks
       env:
         BUILD_DIR: build
-      shell: bash
       run: |
-        source /venv/bin/activate
         cmake -B $BUILD_DIR .
         cmake --build $BUILD_DIR --target generated
-        ./housekeeping/clang-tidy-diff.sh
+        git config --global --add safe.directory $PWD
+        housekeeping/clang-tidy-diff.sh
 
diff --git a/housekeeping/clang-tidy-diff.sh b/housekeeping/clang-tidy-diff.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-BUILD_DIR="${BUILD_DIR:-build}"
+BUILD_DIR="${BUILD_DIR:?}"
 
 cd $(dirname $0)/..
 git diff -U0 HEAD^ | clang-tidy-diff.py -p1 -path $BUILD_DIR -regex "\.(hpp|h)"