From 5b493894d75eff30ba3134a0a5620fe19baee066 Mon Sep 17 00:00:00 2001 From: Edgar Date: Wed, 28 Feb 2024 14:23:12 +0100 Subject: [PATCH] :construction_worker: Updated GitHub actions --- .github/workflows/main.yml | 14 +++++++++----- .github/workflows/sonarcloud.yml | 6 +++--- CMakeLists.txt | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ddc9c01..5bd84c0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,11 @@ jobs: CONAN_USER_HOME_SHORT: None runs-on: windows-latest steps: - - run: echo $env:BUILD_TOOLS_PATH | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - name: Configure sccache + uses: actions/github-script@v7 + with: + script: | + core.addPath(process.env.BUILD_TOOLS_PATH); - uses: actions/checkout@v4 @@ -24,7 +28,7 @@ jobs: run: choco install conan ninja -y - name: Enable Developer Command Prompt - uses: ilammy/msvc-dev-cmd@v1.13.0 + uses: ilammy/msvc-dev-cmd@v1 - name: Build run: | @@ -47,7 +51,7 @@ jobs: - uses: actions/checkout@v4 - name: Cache conan - uses: actions/cache@v4.0.0 + uses: actions/cache@v4 with: key: conan-linux-${{ hashFiles('conanfile.txt') }} path: ~/.conan2/ @@ -56,7 +60,7 @@ jobs: run: | sudo apt-get update curl "https://raw.githubusercontent.com/AnotherFoxGuy/ci-scripts/main/install-cmake.sh" | sudo bash - curl "https://raw.githubusercontent.com/AnotherFoxGuy/ci-scripts/main/install-conan2.0.sh" | sudo bash + curl "https://raw.githubusercontent.com/AnotherFoxGuy/ci-scripts/main/install-conan.sh" | sudo bash sudo apt-get -y install ninja-build - name: Configure @@ -82,7 +86,7 @@ jobs: - uses: actions/checkout@v4 - name: Cache conan - uses: actions/cache@v4.0.0 + uses: actions/cache@v4 with: key: conan-mac-${{ hashFiles('conanfile.txt') }} path: ~/.conan2/ diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 7d1fed6..4533a9d 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -34,7 +34,7 @@ jobs: message("::set-output name=timestamp::${current_date}") - name: cfamily cache files - uses: actions/cache@v4.0.0 + uses: actions/cache@v4 with: path: cfamily-cache key: cfamily-cache-${{ steps.cfamily_cache_timestamp.outputs.timestamp }} @@ -42,7 +42,7 @@ jobs: cfamily-cache- - name: Cache conan - uses: actions/cache@v4.0.0 + uses: actions/cache@v4 with: key: conan-linux-${{ hashFiles('conanfile.txt') }} path: ~/.conan2/ @@ -50,7 +50,7 @@ jobs: - name: Install dependencies run: | curl "https://raw.githubusercontent.com/AnotherFoxGuy/ci-scripts/main/install-cmake.sh" | sudo bash - curl "https://raw.githubusercontent.com/AnotherFoxGuy/ci-scripts/main/install-conan2.0.sh" | sudo bash + curl "https://raw.githubusercontent.com/AnotherFoxGuy/ci-scripts/main/install-conan.sh" | sudo bash - name: Configure run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index eecdcb9..bb5ce16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ #------------------------------------------------------- # moFileReader Main Build Script #------------------------------------------------------- -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.10) list(APPEND CMAKE_MODULE_PATH "${CMAKE_BINARY_DIR}" "${CMAKE_SOURCE_DIR}/cmake") include(CMakeCM)