Merge pull request #352 from ko-matsu/features/elements-taproot

feat: update to v0.4.0
cryptogarageinc · Feb 14, 2022 · e5eb759 · e5eb759
2 parents 7207007 + ce2031e
commit e5eb759
Show file tree

Hide file tree

Showing 58 changed files with 3,672 additions and 287 deletions.
diff --git a/.github/workflows/check_pre-merge_develop.yml b/.github/workflows/check_pre-merge_develop.yml
@@ -14,11 +14,19 @@ env:
 jobs:
   cmake-win-test:
     name: cmake build-win
-    runs-on: windows-2019
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        generator: ['Visual Studio 16 2019', 'MSYS Makefiles']
+        os: [windows-2019, windows-2022]
+        generator: ['MSYS Makefiles']
         shared: [on, off]
+        include:
+          - os: windows-2019
+            shared: [on, off]
+            generator: 'Visual Studio 16 2019'
+          - os: windows-2022
+            shared: [on, off]
+            generator: 'Visual Studio 17 2022'
 
     steps:
     - uses: actions/checkout@v2
@@ -38,10 +46,23 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-10.15, macos-11.0]
+        # os: [macos-10.15]
+        os: [macos-10.15, macos-11]
+        xcode_version: ['11.7']
+        include:
+          - os: macos-10.15
+            xcode_version: '12.4'
+          - os: macos-11
+            xcode_version: '12.5.1'
+          - os: macos-11
+            xcode_version: '13.0'
 
     steps:
     - uses: actions/checkout@v2
+    - name: Select Xcode version
+      run: sudo xcode-select -s '/Applications/Xcode_${{matrix.xcode_version}}.app/Contents/Developer'
+    - name: Show Xcode version
+      run: xcodebuild -version
     - name: cmake_version
       run: cmake --version
     - name: cmake_generage-macos

diff --git a/.github/workflows/check_pre-merge_master.yml b/.github/workflows/check_pre-merge_master.yml
@@ -16,11 +16,19 @@ env:
 jobs:
   cmake-win-test:
     name: cmake build-win
-    runs-on: windows-2019
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        generator: ['Visual Studio 16 2019', 'MSYS Makefiles']
+        os: [windows-2019, windows-2022]
+        generator: ['MSYS Makefiles']
         shared: [on, off]
+        include:
+          - os: windows-2019
+            shared: [on, off]
+            generator: 'Visual Studio 16 2019'
+          - os: windows-2022
+            shared: [on, off]
+            generator: 'Visual Studio 17 2022'
 
     steps:
     - uses: actions/checkout@v2
@@ -40,11 +48,23 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-10.15]
-#        os: [macos-10.15, macos-11.0]
+        # os: [macos-10.15]
+        os: [macos-10.15, macos-11]
+        xcode_version: ['11.7']
+        include:
+          - os: macos-10.15
+            xcode_version: '12.4'
+          - os: macos-11
+            xcode_version: '12.5.1'
+          - os: macos-11
+            xcode_version: '13.2.1'
 
     steps:
     - uses: actions/checkout@v2
+    - name: Select Xcode version
+      run: sudo xcode-select -s '/Applications/Xcode_${{matrix.xcode_version}}.app/Contents/Developer'
+    - name: Show Xcode version
+      run: xcodebuild -version
     - name: cmake_version
       run: cmake --version
     - name: cmake_generage-macos

diff --git a/.github/workflows/check_pre-merge_sprint.yml b/.github/workflows/check_pre-merge_sprint.yml
@@ -14,11 +14,19 @@ env:
 jobs:
   cmake-win:
     name: cmake build-win
-    runs-on: windows-2019
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        generator: ['Visual Studio 16 2019', 'MSYS Makefiles']
+        os: [windows-2019, windows-2022]
+        generator: ['MSYS Makefiles']
         shared: [on]
+        include:
+          - os: windows-2019
+            shared: [on]
+            generator: 'Visual Studio 16 2019'
+          - os: windows-2022
+            shared: [on]
+            generator: 'Visual Studio 17 2022'
 
     steps:
     - uses: actions/checkout@v2
@@ -38,11 +46,23 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-10.15]
-        #os: [macos-10.15, macos-11.0]
+        # os: [macos-10.15]
+        os: [macos-10.15, macos-11]
+        xcode_version: ['11.7']
+        include:
+          - os: macos-10.15
+            xcode_version: '12.4'
+          - os: macos-11
+            xcode_version: '12.5.1'
+          - os: macos-11
+            xcode_version: '13.2.1'
 
     steps:
     - uses: actions/checkout@v2
+    - name: Select Xcode version
+      run: sudo xcode-select -s '/Applications/Xcode_${{matrix.xcode_version}}.app/Contents/Developer'
+    - name: Show Xcode version
+      run: xcodebuild -version
     - name: cmake_version
       run: cmake --version
     - name: cmake_generage-macos

diff --git a/.github/workflows/create_release-and-upload.yml b/.github/workflows/create_release-and-upload.yml
@@ -44,24 +44,36 @@ jobs:
   upload-object-windows:
     name: upload-object-win
     needs: create_releases
-    runs-on: windows-2019
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        bin: [vs2019, vs2019-static, gcc, gcc-static]
+        bin: [vs2022, vs2022-static, vs2019, vs2019-static, gcc, gcc-static]
         include:
+          - bin: vs2022
+            shared: on
+            generator: Visual Studio 17 2022
+            os: windows-2022
+          - bin: vs2022-static
+            shared: off
+            generator: Visual Studio 17 2022
+            os: windows-2022
           - bin: vs2019
             shared: on
             generator: Visual Studio 16 2019
+            os: windows-2019
           - bin: vs2019-static
             shared: off
             generator: Visual Studio 16 2019
+            os: windows-2019
           - bin: gcc
             shared: on
             generator: MSYS Makefiles
+            os: windows-2019
           - bin: gcc-static
             shared: off
             generator: MSYS Makefiles
+            os: windows-2019
 
     steps:
     - name: checkout
@@ -173,7 +185,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        alpine: ['3.10', '3.12', '3.13']
+        alpine: ['3.10', '3.12', '3.13', '3.14', '3.15']
 
     steps:
     - name: checkout
@@ -198,6 +210,16 @@ jobs:
       uses: docker://alpine:3.13
       with:
         entrypoint: /github/workspace/.github/workflows/docker/alpine_build_entrypoint.sh
+    - name: docker setup 3.14
+      if: matrix.alpine == '3.14'
+      uses: docker://alpine:3.14
+      with:
+        entrypoint: /github/workspace/.github/workflows/docker/alpine_build_entrypoint.sh
+    - name: docker setup 3.15
+      if: matrix.alpine == '3.15'
+      uses: docker://alpine:3.15
+      with:
+        entrypoint: /github/workspace/.github/workflows/docker/alpine_build_entrypoint.sh
     - name: create archive file
       run: |
         echo "---- dump output data ----"
@@ -231,17 +253,27 @@ jobs:
   upload-object-macos:
     name: upload-object-macos
     needs: create_releases
-    runs-on: macos-10.15
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        xcode: [10.3, 11.7, 12.4]
+        xcode: ['10.3', '11.7', '12.4', '12.5.1', '13.2.1']
         shared: [on, off]
         include:
+          - xcode: '10.3'
+            os: macos-10.15
+          - xcode: '11.7'
+            os: macos-10.15
+          - xcode: '12.4'
+            os: macos-10.15
+          - xcode: '12.5.1'
+            os: macos-11
+          - xcode: '13.2.1'
+            os: macos-11
           - shared: on
-            suffix:
+            suffix: ''
           - shared: off
-            suffix: -static
+            suffix: '-static'
 
     steps:
     - name: checkout

diff --git a/.github/workflows/docker/alpine_build_entrypoint.sh b/.github/workflows/docker/alpine_build_entrypoint.sh
@@ -16,4 +16,4 @@ make install DESTDIR=/github/workspace/dist
 ls /github/workspace/dist
 ls /github/workspace/dist/usr
 ls /github/workspace/dist/usr/local
-ls /github/workspace/dist/usr/local/lib64
+ls /github/workspace/dist/usr/local/lib*
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -50,7 +50,7 @@ if(CFDCORE_TARGET_VERSION)
 set(CFDCORE_TARGET_TAG  ${CFDCORE_TARGET_VERSION})
 message(STATUS "[external project local] cfd-core target=${CFDCORE_TARGET_VERSION}")
 else()
-set(CFDCORE_TARGET_TAG  v0.3.2)
+set(CFDCORE_TARGET_TAG  v0.4.0)
 endif()
 if(CFDCORE_TARGET_URL)
 set(CFDCORE_TARGET_REP  ${CFDCORE_TARGET_URL})