-

sabudilovskiy · Apr 11, 2024 · 6d72953 · 6d72953
1 parent 5533aac
commit 6d72953
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -61,10 +61,19 @@ jobs:
         run: |
           sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
           wget -qO- https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo tee /etc/apt/trusted.gpg.d/pgdg.asc &>/dev/null
+      - name: Fetch userver
+        continue-on-error: true
+        run: >
+          cmake 
+          -B cmake_build 
+          -G Ninja
+          -DCMAKE_BUILD_TYPE=${{matrix.type}} 
+          -DCMAKE_C_COMPILER=$(make find-c-compiler compiler=${{matrix.compiler}} version=${{matrix.version}})
+          -DCMAKE_CXX_COMPILER=$(make find-cxx-compiler compiler=${{matrix.compiler}} version=${{matrix.version}})
       - name: Install packages
         run: |
           sudo apt update
-          sudo apt install --allow-downgrades -y pep8 $(cat uopenapi/userver/scripts/docs/en/deps/${{matrix.os}}.md | tr '\n' ' ')
+          sudo apt install --allow-downgrades -y pep8 $(cat cmake_build/_deps/userver-src/scripts/docs/en/deps/${{matrix.os}}.md | tr '\n' ' ')
       - name: install compiler
         run: |
           sudo make install-compiler compiler=${{matrix.compiler}} version=${{matrix.version}}
@@ -84,11 +93,13 @@ jobs:
         run: |
           ccache -M 2.0GB
           ccache -s
-
+      - name: Drom cmake build folder
+        run: |
+          rm -rf cmake_build
       - name: Configure cmake project
         run: >
           cmake 
-          -B cmake_build_main 
+          -B cmake_build 
           -G Ninja
           -DCMAKE_BUILD_TYPE=${{matrix.type}} 
           -DCMAKE_C_COMPILER=$(make find-c-compiler compiler=${{matrix.compiler}} version=${{matrix.version}})
@@ -97,10 +108,10 @@ jobs:
       - name: Build project
         run: >
           cmake 
-          --build cmake_build_main
+          --build cmake_build
           --target all
 
       - name: Run tests
         run: | 
-          cd cmake_build_main
+          cd cmake_build
           (test -t 1 && GTEST_COLOR=1 PYTEST_ADDOPTS="--color=yes" ctest -V) || ctest -V