[Openvpn-devel,v1] GHA: Update macOS runners

Message ID 20241015205627.25644-1-gert@greenie.muc.de
State Accepted
Headers show
Series [Openvpn-devel,v1] GHA: Update macOS runners | expand

Commit Message

Gert Doering Oct. 15, 2024, 8:56 p.m. UTC
From: Frank Lichtenheld <frank@lichtenheld.com>

Remove macos-12, not supported anymore.
Add macos-15, runner is available in Beta status.

Change-Id: Ibaa591904095a824df2c0c5aaff73687e0af24fe
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Arne Schwabe <arne-openvpn@rfc2549.org>
Acked-by: Yuriy Darnobyt <yura.uddr@gmail.com>
---

This change was reviewed on Gerrit and approved by at least one
developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/780
This mail reflects revision 1 of this Change.

Acked-by according to Gerrit (reflected above):
Arne Schwabe <arne-openvpn@rfc2549.org>
Yuriy Darnobyt <yura.uddr@gmail.com>

Comments

Gert Doering Oct. 16, 2024, 9:18 a.m. UTC | #1
Tested the 2.6 change on my GH clone (just to be source the 2.6 sources
do not have unexpected surprises for MacOS 15).

Your patch has been applied to the master and release/2.6 branch.

commit 6f74d395383eeca74d6cf6f87ee1387223b2bb1c (master)
commit 914b0ef4bfd71b257976b41727d2aaa946295548 (release/2.6)
Author: Frank Lichtenheld
Date:   Tue Oct 15 22:56:27 2024 +0200

     GHA: Update macOS runners

     Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
     Acked-by: Arne Schwabe <arne-openvpn@rfc2549.org>
     Acked-by: Yuriy Darnobyt <yura.uddr@gmail.com>
     Message-Id: <20241015205627.25644-1-gert@greenie.muc.de>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg29551.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1bc250d..fdd133e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -213,16 +213,16 @@ 
       matrix:
         ssllib: [ openssl11, openssl3, libressl]
         build: [ normal, asan ]
-        os: [macos-12, macos-13, macos-14]
+        os: [macos-13, macos-14, macos-15]
         include:
            # macos14 and newer runners use ARM CPUs and homebrew uses /opt/homebrew/
            # on ARM instead of /usr/local/
-          - os: macos-12
-            homebrew: /usr/local/opt
           - os: macos-13
             homebrew: /usr/local/opt
           - os: macos-14
             homebrew: /opt/homebrew/opt
+          - os: macos-15
+            homebrew: /opt/homebrew/opt
           - build: asan
             cflags: "-fsanitize=address,undefined -fno-sanitize-recover=all  -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1"
             ldflags: -fsanitize=address,undefined -fno-sanitize-recover=all