Skip to content

Commit 7b052e2

Browse files
committed
Merge branch 'main' into fix-cp-in-external-flow
2 parents 29a294f + 267a7f5 commit 7b052e2

File tree

23 files changed

+17274
-227
lines changed

23 files changed

+17274
-227
lines changed

.github/workflows/build-ripunzip.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,33 @@
1-
name: Build runzip
1+
name: Build ripunzip
22

33
on:
44
workflow_dispatch:
55
inputs:
66
ripunzip-version:
77
description: "what reference to checktout from google/runzip"
88
required: false
9-
default: v2.0.2
109
openssl-version:
1110
description: "what reference to checkout from openssl/openssl for Linux"
1211
required: false
13-
default: openssl-3.5.0
12+
pull_request:
13+
paths:
14+
- .github/workflows/build-ripunzip.yml
15+
env:
16+
RIPUNZIP_DEFAULT: v2.0.3
17+
OPENSSL_DEFAULT: openssl-3.6.0
1418

1519
jobs:
1620
build:
1721
strategy:
1822
fail-fast: false
1923
matrix:
20-
os: [ubuntu-22.04, macos-13, windows-2022]
24+
os: [ubuntu-24.04, macos-15, windows-2025]
2125
runs-on: ${{ matrix.os }}
2226
steps:
2327
- uses: actions/checkout@v5
2428
with:
2529
repository: google/ripunzip
26-
ref: ${{ inputs.ripunzip-version }}
30+
ref: ${{ inputs.ripunzip-version || env.RIPUNZIP_DEFAULT }}
2731
# we need to avoid ripunzip dynamically linking into libssl
2832
# see https://github.com/sfackler/rust-openssl/issues/183
2933
- if: runner.os == 'Linux'
@@ -32,7 +36,7 @@ jobs:
3236
with:
3337
repository: openssl/openssl
3438
path: openssl
35-
ref: ${{ inputs.openssl-version }}
39+
ref: ${{ inputs.openssl-version || env.OPENSSL_DEFAULT }}
3640
- if: runner.os == 'Linux'
3741
name: build and install openssl with fPIC
3842
shell: bash

0 commit comments

Comments
 (0)