Skip to content

Commit

Permalink
👷 Updated GitHub actions
Browse files Browse the repository at this point in the history
  • Loading branch information
AnotherFoxGuy committed Feb 28, 2024
1 parent d9e42ea commit 9e7f43d
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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: |
Expand All @@ -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/
Expand Down Expand Up @@ -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/
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ 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 }}
restore-keys: |
cfamily-cache-
- name: Cache conan
uses: actions/cache@v4.0.0
uses: actions/cache@v4
with:
key: conan-linux-${{ hashFiles('conanfile.txt') }}
path: ~/.conan2/
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down

0 comments on commit 9e7f43d

Please sign in to comment.