Merge pull request #322 from pmienk/master

Update CI to macos-13.
libbitcoin · May 21, 2024 · 71540d7 · 71540d7
2 parents df8ac65 + ca9a42b
commit 71540d7
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 42 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,10 +21,10 @@ jobs:
           - os: ubuntu-latest
             script: generate3.sh
 
-          - os: macos-latest
+          - os: macos-13
             script: generate4.sh
 
-          - os: macos-latest
+          - os: macos-13
             script: generate3.sh
 
           - os: windows-latest

diff --git a/generate3.xml b/generate3.xml
@@ -178,15 +178,15 @@
       <!-- image="xcode12.2" equivalent? -->
       <!-- prefix variance? -->
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="dynamic" optimization="size">
         <axis name="boost"  value="build" />
         <axis name="icu" value="build" />
         <option autotools="--enable-isystem" />
       </job>
 
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="static" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -449,15 +449,15 @@
       <!-- image="xcode12.2" equivalent? -->
       <!-- prefix variance? -->
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="dynamic" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
         <option autotools="--enable-isystem" />
       </job>
 
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="static" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -628,15 +628,15 @@
       <!-- boost version from 'brew' incompatible (1.72/1.76 break in asio?) -->
       <!-- boost error from asio if from brew -->
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="dynamic" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
         <option autotools="--enable-isystem" />
       </job>
 
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="static" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -713,7 +713,7 @@
       <dependency name="boost" version="1.73.0" maximum="1.76.0" />
       <dependency name="boost_unit_test_framework" option="tests" />
       <!-- We specify zmq explicitly to require a version with tweetnacl. -->
-      <dependency name="zmq" version="4.3.4" />
+      <dependency name="zmq" version="4.3.5" />
       <dependency name="bitcoin-system" version="3.8.0" />
 
       <!-- General flags -->
@@ -787,7 +787,7 @@
         <option value="${with_boost}" />
         <option value="${with_pkgconfigdir}" />
       </build>
-      <build name="zmq" version="4.3.4" parallel="true" nuget="true" >
+      <build name="zmq" version="4.3.5" parallel="true" nuget="true" >
         <flag value="-w" />
         <option value="--disable-Werror" />
       </build>
@@ -829,7 +829,7 @@
       <!-- image="xcode12.2" equivalent? -->
       <!-- prefix variance? -->
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="dynamic" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -839,7 +839,7 @@
       </job>
 
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="static" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -1030,7 +1030,7 @@
       <axis name="zmq" build="true" />
 
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="dynamic" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -1039,7 +1039,7 @@
       </job>
 
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="static" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -1255,7 +1255,7 @@
       <axis name="zmq" build="true" />
 
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="dynamic" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -1264,7 +1264,7 @@
       </job>
 
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="static" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -1442,15 +1442,15 @@
       <axis name="icu" build="true" with="true" buildwith="true" recognized="true" />
 
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="dynamic" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
         <option autotools="--enable-isystem" />
       </job>
 
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="static" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -1641,15 +1641,15 @@
       <!-- image="xcode12.2" equivalent? -->
       <!-- prefix variance? -->
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="dynamic" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
         <option autotools="--enable-isystem" />
       </job>
 
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="static" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -1842,15 +1842,15 @@
       <!-- image="xcode12.2" equivalent? -->
       <!-- prefix variance? -->
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="dynamic" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
         <option autotools="--enable-isystem" />
       </job>
 
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="static" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -2048,7 +2048,7 @@
       <!-- image="xcode12.2" equivalent? -->
       <!-- prefix variance? -->
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="dynamic" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -2057,7 +2057,7 @@
       </job>
 
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="static" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -2440,7 +2440,7 @@
   </presets>
 
   <integration>
-    <dependency name="boost" os="osx" package="[email protected]" path="/usr/local/opt/[email protected]">
+    <dependency name="boost" os="osx" package="[email protected]" path="/usr/local/opt/[email protected]" defines="-DBOOST_NO_CXX98_FUNCTION_BASE">
       <toolset name="auto" axis="--with-boost=/usr/local/opt/[email protected]" />
       <toolset name="cmake" axis="-DBOOST_ROOT=/usr/local/opt/[email protected] -DBOOST_LIBRARYDIR=/usr/local/opt/[email protected]/lib" />
     </dependency>

diff --git a/generate4.xml b/generate4.xml
@@ -183,7 +183,7 @@
       <!-- image="xcode12.2" equivalent? -->
       <!-- prefix variance? -->
       <job build="all" 
-           system="osx"  
+           system="osx" image="macos-13" 
            assert="ndebug" 
            link="dynamic" 
            optimization="size">
@@ -193,7 +193,7 @@
       </job>
 
       <job build="all" 
-           system="osx"  
+           system="osx" image="macos-13"
            assert="ndebug" 
            link="static" 
            optimization="size">
@@ -535,15 +535,15 @@
       <!-- image="xcode12.2" equivalent? -->
       <!-- prefix variance? -->
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="dynamic" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="with" />
         <option autotools="--enable-isystem" />
       </job>
 
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13"  
            assert="ndebug" link="static" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -751,15 +751,15 @@
       <!-- boost version from 'brew' incompatible (1.72/1.76 break in asio?) -->
       <!-- boost error from asio if from brew -->
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13"  
            assert="ndebug" link="dynamic" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="with" />
         <option autotools="--enable-isystem" />
       </job>
 
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="static" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -949,7 +949,7 @@
       <!-- image="xcode12.2" equivalent? -->
       <!-- prefix variance? -->
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="dynamic" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="with" />
@@ -958,7 +958,7 @@
       </job>
 
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13"  
            assert="ndebug" link="static" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -1535,15 +1535,15 @@
       <axis name="icu" build="true" with="true" buildwith="true" recognized="true" />
 
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13"  
            assert="ndebug" link="dynamic" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
         <option autotools="--enable-isystem" />
       </job>
 
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="static" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -1735,7 +1735,7 @@
       <axis name="consensus" with="true" without="true" recognized="true" />
 
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="dynamic" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -1744,7 +1744,7 @@
       </job>
 
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13"  
            assert="ndebug" link="static" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -1951,7 +1951,7 @@
       <!--<axis name="consensus" with="true" without="true" recognized="true" />-->
 
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="dynamic" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -1960,7 +1960,7 @@
       </job>
 
       <job build="all" 
-           system="osx" 
+           system="osx" image="macos-13" 
            assert="ndebug" link="static" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -2674,7 +2674,7 @@
   </msvc>
 
   <integration>
-    <dependency name="boost" os="osx" package="boost" />
+    <dependency name="boost" os="osx" package="boost" defines="-DBOOST_NO_CXX98_FUNCTION_BASE" />
     <dependency name="icu" os="osx" package="icu4c" />
   </integration>
 

diff --git a/templates/gsl.ci.yml b/templates/gsl.ci.yml
@@ -377,6 +377,19 @@ function get_job_cflags(integration, repository, job)
                 if (defined(my.dependency.path))
                     my.flags = "$(my.flags) -I$(my.dependency.path)/include"
                 endif
+
+                if (defined(my.dependency.defines))
+                    my.flags = "$(my.flags) $(my.dependency.defines)"
+                endif
+            endif
+        else
+            if (count(my.integration.dependency, ((count.name = _axis.name) & (count.os = my.job.system))) = 1)
+                define my.dependency = my.integration->dependency(\
+                    (name = _axis.name) & (os = my.job.system))
+
+                if (defined(my.dependency.defines))
+                    my.flags = "$(my.flags) $(my.dependency.defines)"
+                endif
             endif
         endif
     endfor
@@ -790,11 +803,12 @@ endfunction # get_sln_tests
 
 
       - name: Failure display otool output
-        if: ${{ failure() && (matrix.os == 'macos-latest') }}
+        if: ${{ failure() && startsWith(matrix.os, 'macos') }}
         run: |
           otool -L ${{ github.workspace }}/test/.libs/$(_repository.name)-test
+
       - name: Failure display DYLD_PRINT_LIBRARIES
-        if: ${{ failure() && (matrix.os == 'macos-latest') }}
+        if: ${{ failure() && startsWith(matrix.os, 'macos') }}
         run: |
           DYLD_PRINT_LIBRARIES=1 ${{ github.workspace }}/test/.libs/$(_repository.name)-test