Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix builds, update build containers, update dependencies, and fix ci. #724

Merged
merged 12 commits into from
Mar 29, 2024

Conversation

achow101
Copy link
Member

Couple of minor things that weren't fully working while doing the 2.4.0 build.

Also periodic update to dependencies.

@hebasto
Copy link
Member

hebasto commented Jan 31, 2024

While fixing CI, suggesting to upgrade GHA actions to avoid deprecation warnings:

diff --git a/.github/actions/build-bitcoind/action.yml b/.github/actions/build-bitcoind/action.yml
index 49f9c72..0292d7c 100644
--- a/.github/actions/build-bitcoind/action.yml
+++ b/.github/actions/build-bitcoind/action.yml
@@ -9,7 +9,7 @@ runs:
         sudo apt-get install -y ccache
         echo "CCACHE_DIR=${{ runner.temp }}/ccache" >> "$GITHUB_ENV"
 
-    - uses: actions/cache/restore@v3
+    - uses: actions/cache/restore@v4
       id: ccache-cache
       with:
         path: ${{ env.CCACHE_DIR }}
@@ -25,13 +25,13 @@ runs:
         ccache --show-stats --verbose
         tar -czf bitcoind.tar.gz test/work/bitcoin/src/bitcoind
 
-    - uses: actions/cache/save@v3
+    - uses: actions/cache/save@v4
       if: github.event_name != 'pull_request' && steps.ccache-cache.outputs.cache-hit != 'true'
       with:
         path: ${{ env.CCACHE_DIR }}
         key: ${{ github.job }}-ccache-${{ github.run_id }}
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: bitcoind
         path: bitcoind.tar.gz
diff --git a/.github/actions/install-sim/action.yml b/.github/actions/install-sim/action.yml
index 1a85e35..f9799f1 100644
--- a/.github/actions/install-sim/action.yml
+++ b/.github/actions/install-sim/action.yml
@@ -7,7 +7,7 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: ${{ inputs.device == 'ledger-legacy' && 'ledger' || inputs.device }}-sim
 
@@ -55,7 +55,7 @@ runs:
         pip install construct flask-restful jsonschema mnemonic pyelftools pillow requests pytesseract
 
     - if: inputs.device == 'ledger'
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: ledger_app
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 600d248..dd9d792 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -133,7 +133,7 @@ jobs:
               find dist -type f -exec sha256sum {} \;
             "
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: dist
           path: dist/
@@ -173,7 +173,7 @@ jobs:
           cd test; ./setup_environment.sh --${{ matrix.device.name }}; cd ..
           tar -czf ${{ matrix.device.archive }}.tar.gz ${{ matrix.device.paths }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.device.name }}-sim
           path: ${{ matrix.device.archive }}.tar.gz
@@ -188,7 +188,7 @@ jobs:
           cd app-bitcoin-new
           make DEBUG=1
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ledger_app
           path: app-bitcoin-new/bin/app.elf
@@ -240,7 +240,7 @@ jobs:
       - run: |
           pip install poetry
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: dist
           path: dist/
@@ -248,7 +248,7 @@ jobs:
       - run: |
           ${{ matrix.script.install }}
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: bitcoind
 
@@ -297,7 +297,7 @@ jobs:
           pip install poetry
           poetry install
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: bitcoind
 

@brunoerg
Copy link
Contributor

code lgtm! (did not review build stuff)

@achow101 achow101 merged commit cfaf26c into bitcoin-core:master Mar 29, 2024
255 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants