From 3efd61e27ccdc71f8a61d2ab82d97870d6975309 Mon Sep 17 00:00:00 2001 From: theMackabu Date: Wed, 8 Apr 2026 23:51:41 -0700 Subject: [PATCH] update action versions --- .github/actions/build-native-deps/action.yml | 2 +- .github/actions/build-project/action.yml | 4 ++-- .github/actions/setup-zig/action.yml | 2 +- .github/workflows/build-platform.yml | 6 +++--- meson/deps/meson.build | 4 ++++ 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/actions/build-native-deps/action.yml b/.github/actions/build-native-deps/action.yml index 3e267f0..2b9991e 100644 --- a/.github/actions/build-native-deps/action.yml +++ b/.github/actions/build-native-deps/action.yml @@ -40,7 +40,7 @@ runs: - name: Cache native deps id: cache - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ${{ inputs.prefix }} key: deps-${{ runner.os }}-${{ runner.arch }}-${{ steps.deps-hash.outputs.hash }}-${{ hashFiles('.github/versions.json') }}-v1 diff --git a/.github/actions/build-project/action.yml b/.github/actions/build-project/action.yml index 5842220..0d689b7 100644 --- a/.github/actions/build-project/action.yml +++ b/.github/actions/build-project/action.yml @@ -58,12 +58,12 @@ runs: working-directory: src/tools - name: Cache vendor deps - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: | vendor/*/ build/vendor - key: vendor-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('vendor/*.wrap') }} + key: vendor-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('vendor/*.wrap', 'vendor/packagefiles/**', 'meson/deps/meson.build') }} - name: Configure and build shell: bash diff --git a/.github/actions/setup-zig/action.yml b/.github/actions/setup-zig/action.yml index f8c7180..eb91e6e 100644 --- a/.github/actions/setup-zig/action.yml +++ b/.github/actions/setup-zig/action.yml @@ -25,7 +25,7 @@ runs: - name: Cache Zig id: cache - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ${{ steps.platform.outputs.install_path }} key: zig-${{ steps.platform.outputs.slug }}-${{ inputs.version }} diff --git a/.github/workflows/build-platform.yml b/.github/workflows/build-platform.yml index 809b822..b6c02e8 100644 --- a/.github/workflows/build-platform.yml +++ b/.github/workflows/build-platform.yml @@ -117,7 +117,7 @@ jobs: shell: bash - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: submodules: recursive @@ -211,7 +211,7 @@ jobs: # === UPLOAD ARTIFACTS === - name: Upload binary - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: ${{ steps.config.outputs.artifact_name }} path: | @@ -223,7 +223,7 @@ jobs: run: echo "${{ steps.build.outputs.version }}" > version.txt - name: Upload version info - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: version-${{ steps.config.outputs.artifact_name }} path: version.txt diff --git a/meson/deps/meson.build b/meson/deps/meson.build index 30713db..8c27eef 100644 --- a/meson/deps/meson.build +++ b/meson/deps/meson.build @@ -20,6 +20,10 @@ endif boringssl_warning_flag = cc.get_argument_syntax() == 'msvc' ? '/W0' : '-w' boringssl_opts.append_compile_args('c', boringssl_warning_flag) boringssl_opts.append_compile_args('cpp', boringssl_warning_flag) +if host_machine.system() == 'windows' + boringssl_opts.append_compile_args('c', '-DOPENSSL_WINDOWS') + boringssl_opts.append_compile_args('cpp', '-DOPENSSL_WINDOWS') +endif boringssl_opts.set_override_option('warning_level', '0') boringssl_opts.set_override_option('optimization', 's') -- 2.51.2