From 15ad1984935118ca7d591c9db401f2d343e9a2d0 Mon Sep 17 00:00:00 2001 From: xlauko Date: Fri, 1 Mar 2024 10:52:53 +0000 Subject: [PATCH] xxx --- .github/workflows/build.yml | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7ba6009..20438dd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,9 +13,6 @@ env: VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/vcpkg/bincache # Use specific vcpkg version VCPKG_COMMIT_ID: '5568f110b509a9fd90711978a7cb76bae75bb092' - # Setup clang - CC: clang-17 - CXX: clang++-17 jobs: build: @@ -24,21 +21,18 @@ jobs: timeout-minutes: 15 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v2 with: submodules: true - name: Install dependencies run: | - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - - sudo add-apt-repository -y "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main" sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo apt-get update sudo apt-get install -y \ - gpg wget curl zip unzip tar git pkg-config build-essential software-properties-common \ - ninja-build make clang-tidy cppcheck ccache \ - doctest-dev clang-17 g++-13 libc++abi-13-dev libstdc++-13-dev - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 13 --slave /usr/bin/g++ g++ /usr/bin/g++-13 + gpg wget curl zip unzip tar git pkg-config \ + ninja-build clang-tidy cppcheck ccache build-essential \ + doctest-dev - name: "Create directory '${{ env.VCPKG_DEFAULT_BINARY_CACHE }}'" run: mkdir -p $VCPKG_DEFAULT_BINARY_CACHE @@ -54,8 +48,8 @@ jobs: vcpkgJsonGlob: 'vcpkg.json' - name: Run cmake - run: | - echo | clang++-17 -E -Wp,-v - - ls /usr/include/c++/13/ - clang-17 -v - cmake --workflow --preset ci + uses: lukka/run-cmake@v10 + with: + configurePreset: 'ninja-multi-vcpkg' + buildPreset: 'ninja-vcpkg-deb' + testPreset: 'ninja-vcpkg-deb' \ No newline at end of file