From 1aed0669136ca5214b1799d9ae5fbb79c8abd55e Mon Sep 17 00:00:00 2001 From: HolyWu Date: Mon, 20 May 2024 18:59:13 +0800 Subject: [PATCH 1/2] linux.yml: Migrate to ubuntu-24.04 and use GCC 14 --- .github/workflows/linux.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 02cbd43..89f5afd 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -4,11 +4,11 @@ on: [push, pull_request, workflow_dispatch] jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 env: - CC: gcc-13 - CXX: g++-13 + CC: gcc-14 + CXX: g++-14 steps: - uses: actions/checkout@v4 From 21bf18149d339ff2bb87db9022efa644fe2d2d10 Mon Sep 17 00:00:00 2001 From: HolyWu Date: Mon, 20 May 2024 19:21:43 +0800 Subject: [PATCH 2/2] macos.yml: Update environment variables --- .github/workflows/macos.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index cd91196..4799497 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -17,19 +17,17 @@ jobs: - name: Install Homebrew packages run: | - export HOMEBREW_NO_INSTALL_CLEANUP=1 export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 - # Skip brew update for now, see https://github.com/actions/setup-python/issues/577 - # brew update + brew update brew install ffmpeg llvm meson vapoursynth xxhash - name: Set environment variables for Clang/LLVM run: | - echo "CC=/usr/local/opt/llvm/bin/clang" >> $GITHUB_ENV - echo "CXX=/usr/local/opt/llvm/bin/clang++" >> $GITHUB_ENV - echo "PATH=/usr/local/opt/llvm/bin:$PATH" >> $GITHUB_ENV + echo "CC=/opt/homebrew/opt/llvm/bin/clang" >> $GITHUB_ENV + echo "CXX=/opt/homebrew/opt/llvm/bin/clang++" >> $GITHUB_ENV + echo "PATH=/opt/homebrew/opt/llvm/bin:$PATH" >> $GITHUB_ENV - name: Build run: | - meson setup -Dcpp_link_args=-fuse-ld=lld build + meson setup "-Dcpp_link_args=['-fuse-ld=lld', '-L/opt/homebrew/opt/llvm/lib/c++', '-Wl,-rpath,/opt/homebrew/opt/llvm/lib/c++']" build ninja -C build