From 0bc08bc7f17b334253d2fcf431808fd876ce2a1f Mon Sep 17 00:00:00 2001 From: filipecosta90 Date: Thu, 21 Nov 2024 23:44:05 +0000 Subject: [PATCH 1/5] Migrate checkout github action from v2 to v4. Using macos-12 for openssl@1.1 runs due do deprecation notices. --- .github/workflows/ci.yml | 24 +++++++++++++++++++++--- .github/workflows/release.yml | 4 ++-- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cee573a..d185071 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ jobs: build-notls: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install dependencies run: | sudo apt-get -qq update @@ -21,7 +21,7 @@ jobs: platform: [ubuntu-latest, ubuntu-20.04] runs-on: ${{ matrix.platform }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install dependencies run: | sudo apt-get -qq update @@ -103,7 +103,7 @@ jobs: build-macos: strategy: matrix: - openssl: ["1.1", "3.0"] + openssl: ["3.0"] runs-on: macos-latest continue-on-error: true steps: @@ -113,6 +113,24 @@ jobs: - name: Build run: autoreconf -ivf && PKG_CONFIG_PATH=`brew --prefix openssl@${{ matrix.openssl }}`/lib/pkgconfig ./configure && make + # According to https://github.com/actions/runner-images/blob/macos-14-arm64/20241119.509/images/macos/macos-14-arm64-Readme.md + # [macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4, 2024 + # so use macos-12 which does not have the deprecation notice + build-macos-openssl-1-1: + strategy: + matrix: + platform: [macos-12] + runs-on: ${{ matrix.platform }} + steps: + - uses: actions/checkout@v1 + - name: Install dependencies + run: brew install autoconf automake libtool libevent pkg-config + - name: Install openssl v1.0.2 + run: brew install rbenv/tap/openssl@1.0 + - name: Build + run: autoreconf -ivf && PKG_CONFIG_PATH=`brew --prefix openssl@1.0`/lib/pkgconfig ./configure && make + + build-macos-openssl-1-0-2: strategy: matrix: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8d19618..d61d922 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ jobs: matrix: dist: ${{ fromJSON(vars.BUILD_DISTS) }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: path: sources - name: Install dependencies @@ -70,7 +70,7 @@ jobs: exclude: ${{ fromJSON(vars.BUILD_EXCLUDE) }} needs: build-source-package steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Determine build architecture run: | if [ ${{ matrix.arch }} = "i386" ]; then From 27534597fc5c112a96b5605195d86cc4b0b3074f Mon Sep 17 00:00:00 2001 From: filipecosta90 Date: Thu, 21 Nov 2024 23:46:30 +0000 Subject: [PATCH 2/5] Using macos-12 for openssl@1.0.2 runs due do deprecation notices. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d185071..d55fb34 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -134,7 +134,7 @@ jobs: build-macos-openssl-1-0-2: strategy: matrix: - platform: [macos-latest] + platform: [macos-12] runs-on: ${{ matrix.platform }} steps: - uses: actions/checkout@v1 From 9b1ac92d3a1e36f1e1d1833792990b75edc1603d Mon Sep 17 00:00:00 2001 From: filipecosta90 Date: Fri, 22 Nov 2024 00:02:26 +0000 Subject: [PATCH 3/5] Using macos-15 for openssl@3.0 runs. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d55fb34..1da3354 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -104,7 +104,7 @@ jobs: strategy: matrix: openssl: ["3.0"] - runs-on: macos-latest + runs-on: macos-15 continue-on-error: true steps: - uses: actions/checkout@v1 From 6b3dcaf55c5dba466f482c5988e60dc4f9a1f834 Mon Sep 17 00:00:00 2001 From: filipecosta90 Date: Fri, 22 Nov 2024 00:05:51 +0000 Subject: [PATCH 4/5] Dont link again pkg-config on macos given it's already present. --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1da3354..5f29944 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -104,12 +104,12 @@ jobs: strategy: matrix: openssl: ["3.0"] - runs-on: macos-15 + runs-on: macos-latest continue-on-error: true steps: - uses: actions/checkout@v1 - name: Install dependencies - run: brew install autoconf automake libtool libevent pkg-config openssl@${{ matrix.openssl }} + run: brew install autoconf automake libtool libevent openssl@${{ matrix.openssl }} - name: Build run: autoreconf -ivf && PKG_CONFIG_PATH=`brew --prefix openssl@${{ matrix.openssl }}`/lib/pkgconfig ./configure && make From bc8cb6bbefca4e07b0474ce22795019a25bb1153 Mon Sep 17 00:00:00 2001 From: filipecosta90 Date: Fri, 22 Nov 2024 00:08:15 +0000 Subject: [PATCH 5/5] Using macos-12 for openssl@1.1 runs due do deprecation notices. --- .github/workflows/ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f29944..9cb2b2e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -124,11 +124,9 @@ jobs: steps: - uses: actions/checkout@v1 - name: Install dependencies - run: brew install autoconf automake libtool libevent pkg-config - - name: Install openssl v1.0.2 - run: brew install rbenv/tap/openssl@1.0 + run: brew install autoconf automake libtool libevent openssl@1.1 - name: Build - run: autoreconf -ivf && PKG_CONFIG_PATH=`brew --prefix openssl@1.0`/lib/pkgconfig ./configure && make + run: autoreconf -ivf && PKG_CONFIG_PATH=`brew --prefix openssl@1.1`/lib/pkgconfig ./configure && make build-macos-openssl-1-0-2: