From 642fdd7e6d0b7d0301e846f4ae6296a63fa73b1b Mon Sep 17 00:00:00 2001 From: Roman Fomin Date: Thu, 19 Oct 2023 21:50:49 +0700 Subject: [PATCH] update GitHub workflows * Update checkout action version * Remove Strawberry Perl and HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK workarounds --- .github/workflows/main.yml | 6 ++---- .github/workflows/win_msvc.yml | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fe3180f5..d24faa93 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,8 +58,6 @@ jobs: - name: Install dependencies (macOS) if: runner.os == 'macOS' - env: - HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1 run: | brew install \ ninja \ @@ -87,7 +85,7 @@ jobs: ${{ matrix.config.msys-env }}-fluidsynth ${{ matrix.config.msys-env }}-libxmp - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Configure env: @@ -134,7 +132,7 @@ jobs: - name: Install dependencies run: sudo apt-get update && sudo apt-get install cppcheck - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Run cppcheck shell: bash diff --git a/.github/workflows/win_msvc.yml b/.github/workflows/win_msvc.yml index 80249308..af0a2558 100644 --- a/.github/workflows/win_msvc.yml +++ b/.github/workflows/win_msvc.yml @@ -33,7 +33,7 @@ jobs: } steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup vcpkg and NuGet shell: bash @@ -64,7 +64,6 @@ jobs: -DVCPKG_TARGET_TRIPLET="${{ matrix.config.arch }}-windows-static-release" ` -DVCPKG_OVERLAY_TRIPLETS="cmake/triplets" ` -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded ` - -DCMAKE_IGNORE_PATH="C:/Strawberry/perl/bin;C:/Strawberry/c/lib" - name: Build run: cmake --build build --config "Release"