Merge pull request #285 from ko-matsu/feature/release-v0.3.7

release: v0.3.7
cryptogarageinc · Mar 25, 2021 · c50037e · c50037e
2 parents 3774f84 + eeb733d
commit c50037e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 59 deletions.
diff --git a/.github/workflows/create_release-and-upload.yml b/.github/workflows/create_release-and-upload.yml
@@ -168,57 +168,14 @@ jobs:
         asset_name: cfd-${{ steps.get_version.outputs.VERSION }}-ubuntu${{ matrix.os_ver }}04-${{ matrix.bin }}-x86_64.zip
         asset_content_type: application/zip
 
-  upload-object-alpine-3-10:
-    name: upload-object-alpine-3.10
-    needs: create_releases
-    runs-on: ubuntu-18.04
-
-    steps:
-    - name: checkout
-      uses: actions/checkout@v2
-    - name: Get the version
-      id: get_version
-      run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
-    - name: list
-      run: ls -a $GITHUB_WORKSPACE
-    - name: docker setup
-      uses: docker://alpine:3.10
-      with:
-        entrypoint: /github/workspace/.github/workflows/docker/alpine_build_entrypoint.sh
-    - name: create archive file
-      run: |
-        echo "---- dump output data ----"
-        ls -l $GITHUB_WORKSPACE/dist/usr/local/*
-        mkdir -p /tmp/cfd
-        sudo chmod 777 /tmp/cfd
-        sudo chown runner /tmp/cfd
-        sudo cp -r $GITHUB_WORKSPACE/dist/usr /tmp/cfd
-        cd /tmp/cfd
-        sudo zip -r /tmp/cfd/cfd.zip usr
-        sudo chmod 777 /tmp/cfd/cfd.zip
-        sudo chown runner /tmp/cfd/cfd.zip
-        sudo cp -rp /tmp/cfd/cfd.zip $GITHUB_WORKSPACE/dist/cfd.zip
-        echo "---- dump zip file ----"
-        sudo ls -l /tmp/cfd
-    - name: output url
-      id: get_url
-      run: echo "::set-output name=upload_url::${{ needs.create_releases.outputs.release_url }}"
-    - name: Upload Release Asset
-      id: upload-release-asset 
-#      if: success()
-      uses: actions/upload-release-asset@v1.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.get_url.outputs.upload_url }}
-        asset_path: /tmp/cfd/cfd.zip
-        asset_name: cfd-${{ steps.get_version.outputs.VERSION }}-alpine-3.10-x86_64.zip
-        asset_content_type: application/zip
-
-  upload-object-alpine-3-12:
-    name: upload-object-alpine-3.12
+  upload-object-alpine:
+    name: upload-object-alpine
     needs: create_releases
     runs-on: ubuntu-18.04
+    strategy:
+      fail-fast: false
+      matrix:
+        alpine: [3.10, 3.12, 3.13]
 
     steps:
     - name: checkout
@@ -229,7 +186,7 @@ jobs:
     - name: list
       run: ls -a $GITHUB_WORKSPACE
     - name: docker setup
-      uses: docker://alpine:3.12
+      uses: docker://alpine:${{ matrix.alpine }}
       with:
         entrypoint: /github/workspace/.github/workflows/docker/alpine_build_entrypoint.sh
     - name: create archive file
@@ -259,7 +216,7 @@ jobs:
       with:
         upload_url: ${{ steps.get_url.outputs.upload_url }}
         asset_path: /tmp/cfd/cfd.zip
-        asset_name: cfd-${{ steps.get_version.outputs.VERSION }}-alpine-3.12-x86_64.zip
+        asset_name: cfd-${{ steps.get_version.outputs.VERSION }}-alpine-${{ matrix.alpine }}-x86_64.zip
         asset_content_type: application/zip
 
   upload-object-macos:
@@ -269,7 +226,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        xcode: [10.3, 11.7, 12.2]
+        xcode: [10.3, 11.7, 12.4]
         shared: [on, off]
         include:
           - shared: on

diff --git a/local_resource/external_project_local_setting.config b/local_resource/external_project_local_setting.config
@@ -1,4 +1,4 @@
-CFD_VERSION=0.3.6
-CFDCORE_TARGET_VERSION=refs/tags/v0.3.6
+CFD_VERSION=0.3.7
+CFDCORE_TARGET_VERSION=refs/tags/v0.3.7
 LIBWALLY_TARGET_VERSION=refs/tags/cfd-0.3.4
 CFDCORE_TARGET_URL=cryptogarageinc/cfd-core.git
diff --git a/src/cfd_psbt.cpp b/src/cfd_psbt.cpp
@@ -764,11 +764,12 @@ UtxoData Psbt::GetUtxoData(uint32_t index, NetType net_type) const {
     if (witness_only &&
         (psbt_pointer->inputs[index].final_witness != nullptr)) {
       auto witness_stack = psbt_pointer->inputs[index].final_witness;
-      uint32_t last_index = witness_stack->num_items;
+      uint32_t last_index = static_cast<uint32_t>(witness_stack->num_items);
       if (last_index > 0) {
         ByteData last_data(
             witness_stack->items[last_index - 1].witness,
-            witness_stack->items[last_index - 1].witness_len);
+            static_cast<uint32_t>(
+                witness_stack->items[last_index - 1].witness_len));
         if (Pubkey::IsValid(last_data)) {
           key_list.emplace_back(KeyData(Pubkey(last_data), "", ByteData()));
           if (utxo.address_type == AddressType::kP2shAddress) {
@@ -789,9 +790,10 @@ UtxoData Psbt::GetUtxoData(uint32_t index, NetType net_type) const {
     } else if (psbt_pointer->inputs[index].final_scriptsig != nullptr) {
       Script scriptsig(ByteData(
           psbt_pointer->inputs[index].final_scriptsig,
-          psbt_pointer->inputs[index].final_scriptsig_len));
+          static_cast<uint32_t>(
+              psbt_pointer->inputs[index].final_scriptsig_len)));
       auto items = scriptsig.GetElementList();
-      uint32_t last_index = items.size();
+      uint32_t last_index = static_cast<uint32_t>(items.size());
       if (last_index > 0) {
         ByteData last_data = items[last_index - 1].GetBinaryData();
         if (Pubkey::IsValid(last_data)) {

diff --git a/src/jsonapi/cfd_json_transaction.cpp b/src/jsonapi/cfd_json_transaction.cpp
@@ -405,7 +405,7 @@ std::vector<Address> TransactionJsonApi::ConvertFromLockingScript(
       address = factory.GetSegwitAddressByHash(
             extract_data.pushed_datas[0], extract_data.witness_version);
       addr_list.push_back(address);
-    } catch (const CfdException& except) {
+    } catch (const CfdException&) {
       // If the data is invalid, it will not be output.
     }
   } else {