Skip to content

Commit 0fbf8b7

Browse files
GH actions deprecation fixes: migrate checkout github action from v2 to v4 and openssl@1.1/1.0 fixes. (#281)
1 parent 42b228f commit 0fbf8b7

File tree

2 files changed

+23
-7
lines changed

2 files changed

+23
-7
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
build-notls:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v2
9+
- uses: actions/checkout@v4
1010
- name: Install dependencies
1111
run: |
1212
sudo apt-get -qq update
@@ -21,7 +21,7 @@ jobs:
2121
platform: [ubuntu-latest, ubuntu-20.04]
2222
runs-on: ${{ matrix.platform }}
2323
steps:
24-
- uses: actions/checkout@v2
24+
- uses: actions/checkout@v4
2525
- name: Install dependencies
2626
run: |
2727
sudo apt-get -qq update
@@ -103,20 +103,36 @@ jobs:
103103
build-macos:
104104
strategy:
105105
matrix:
106-
openssl: ["1.1", "3.0"]
106+
openssl: ["3.0"]
107107
runs-on: macos-latest
108108
continue-on-error: true
109109
steps:
110110
- uses: actions/checkout@v1
111111
- name: Install dependencies
112-
run: brew install autoconf automake libtool libevent pkg-config openssl@${{ matrix.openssl }}
112+
run: brew install autoconf automake libtool libevent openssl@${{ matrix.openssl }}
113113
- name: Build
114114
run: autoreconf -ivf && PKG_CONFIG_PATH=`brew --prefix openssl@${{ matrix.openssl }}`/lib/pkgconfig ./configure && make
115115

116+
# According to https://github.com/actions/runner-images/blob/macos-14-arm64/20241119.509/images/macos/macos-14-arm64-Readme.md
117+
# [macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4, 2024
118+
# so use macos-12 which does not have the deprecation notice
119+
build-macos-openssl-1-1:
120+
strategy:
121+
matrix:
122+
platform: [macos-12]
123+
runs-on: ${{ matrix.platform }}
124+
steps:
125+
- uses: actions/checkout@v1
126+
- name: Install dependencies
127+
run: brew install autoconf automake libtool libevent openssl@1.1
128+
- name: Build
129+
run: autoreconf -ivf && PKG_CONFIG_PATH=`brew --prefix openssl@1.1`/lib/pkgconfig ./configure && make
130+
131+
116132
build-macos-openssl-1-0-2:
117133
strategy:
118134
matrix:
119-
platform: [macos-latest]
135+
platform: [macos-12]
120136
runs-on: ${{ matrix.platform }}
121137
steps:
122138
- uses: actions/checkout@v1

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
matrix:
2525
dist: ${{ fromJSON(vars.BUILD_DISTS) }}
2626
steps:
27-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v4
2828
with:
2929
path: sources
3030
- name: Install dependencies
@@ -70,7 +70,7 @@ jobs:
7070
exclude: ${{ fromJSON(vars.BUILD_EXCLUDE) }}
7171
needs: build-source-package
7272
steps:
73-
- uses: actions/checkout@v2
73+
- uses: actions/checkout@v4
7474
- name: Determine build architecture
7575
run: |
7676
if [ ${{ matrix.arch }} = "i386" ]; then

0 commit comments

Comments
 (0)