test: ci

p2pderivatives · Sep 12, 2024 · c8334c4 · c8334c4
1 parent 607ab89
commit c8334c4
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 26 deletions.
diff --git a/.github/workflows/check_pre-merge_develop.yml b/.github/workflows/check_pre-merge_develop.yml
@@ -25,17 +25,17 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-11, windows-2019, ubuntu-20.04]
-        node: [16, 18, 19, 20]
+        os: [macos-13, windows-2022, ubuntu-22.04]
+        node: [20, 22]
         exclude:
-          - os: macos-11
-            node: 14
-          - os: macos-11
-            node: 19
+          - os: macos-13
+            node: 20
+          - os: macos-13
+            node: 20
 
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
       timeout-minutes: 2
       with:
         node-version: ${{ matrix.node }}

diff --git a/.github/workflows/check_pre-merge_master.yml b/.github/workflows/check_pre-merge_master.yml
@@ -12,8 +12,8 @@ on:
 
 env:
   CMAKE_BUILD_PARALLEL_LEVEL: 4
-  GITHUB_ELEMENTS_VERSION: v0.1.0
-  GITHUB_BITCOIN_VERSION: v0.1.0
+  GITHUB_ELEMENTS_VERSION: v0.2.3
+  GITHUB_BITCOIN_VERSION: v0.2.3
   GITHUB_DOCKER_IMAGE: ghcr.io/cryptogarageinc/elements-testing
   ELEMENTS_ENTRYPOINT_PATH: /github/workspace/.github/workflows/docker/test_entrypoint.sh
   BITCOIN_ENTRYPOINT_PATH: /github/workspace/.github/workflows/docker/test_bitcoin_entrypoint.sh
@@ -25,17 +25,17 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-11, windows-2019, ubuntu-20.04]
-        node: [16, 18, 19, 20]
+        os: [macos-13, windows-2022, ubuntu-22.04]
+        node: [20, 22]
         exclude:
-          - os: macos-11
-            node: 14
-          - os: macos-11
-            node: 19
+          - os: macos-13
+            node: 20
+          - os: macos-13
+            node: 20
 
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
       timeout-minutes: 2
       with:
         node-version: ${{ matrix.node }}

diff --git a/.github/workflows/check_pre-merge_sprint.yml b/.github/workflows/check_pre-merge_sprint.yml
@@ -24,17 +24,17 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-11, windows-2019, ubuntu-20.04]
-        node: [16, 18, 19, 20]
+        os: [macos-13, windows-2022, ubuntu-22.04]
+        node: [20, 22]
         exclude:
-          - os: macos-11
-            node: 14
-          - os: macos-11
-            node: 19
+          - os: macos-13
+            node: 20
+          - os: macos-13
+            node: 20
 
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
       timeout-minutes: 2
       with:
         node-version: ${{ matrix.node }}

diff --git a/.github/workflows/docker/test_entrypoint.sh b/.github/workflows/docker/test_entrypoint.sh
@@ -40,6 +40,10 @@ do
   elements-cli -chain=liquidregtest -datadir=${WORKDIR_PATH}/elementsd_datadir ping > /dev/null 2>&1
 done
 echo "start elements node"
+elements-cli -chain=liquidregtest -datadir=${WORKDIR_PATH}/elementsd_datadir createwallet wallet
+
+bitcoin-cli --regtest -datadir=${WORKDIR_PATH}/bitcoind_datadir createwallet wallet false false "" false false
+elements-cli -chain=liquidregtest -datadir=${WORKDIR_PATH}/elementsd_datadir createwallet wallet false false "" false false
 
 set -e
 

diff --git a/addon/CMakeLists.txt b/addon/CMakeLists.txt
@@ -38,6 +38,12 @@ if(NOT CFD_SRC_ROOT_DIR)
 set(CFD_SRC_ROOT_DIR   ${CMAKE_SOURCE_DIR})
 endif()
 
+# for cmake-js 7.0.0
+if(MSVC AND CMAKE_JS_NODELIB_DEF AND CMAKE_JS_NODELIB_TARGET)
+  # Generate node.lib
+  execute_process(COMMAND ${CMAKE_AR} /def:${CMAKE_JS_NODELIB_DEF} /out:${CMAKE_JS_NODELIB_TARGET} ${CMAKE_STATIC_LINKER_FLAGS})
+endif()
+
 # cfd-js
 project(cfd_js CXX)
 set(CMAKE_CXX_STANDARD 11)