Skip to content

Commit dc51d2b

Browse files
authored
Build intallers on PR (#288)
* Build intallers on PR * fixes * bump version * Add dev branch to CI
1 parent dbf74c0 commit dc51d2b

File tree

14 files changed

+11
-13
lines changed

14 files changed

+11
-13
lines changed

.github/workflows/main.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
branches:
77
- main
88
- develop
9+
- dev
910

1011
jobs:
1112
configure:
@@ -220,7 +221,6 @@ jobs:
220221

221222
build_package_nanos:
222223
needs: [configure, setup_rust, build, build_ledger, test_zemu]
223-
if: ${{ github.ref == 'refs/heads/main' }}
224224
runs-on: ubuntu-latest
225225
container:
226226
image: zondax/ledger-app-builder:latest
@@ -264,10 +264,11 @@ jobs:
264264
id: nanos
265265
run: echo "tag_name=$(./app/pkg/installer_nanos.sh version)" >> $GITHUB_OUTPUT
266266
- name: Create or Update Release (1)
267+
if: ${{ github.ref == 'refs/heads/main' }}
267268
id: create_release_0
268269
uses: softprops/action-gh-release@v1
269270
env:
270-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
271+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
271272
with:
272273
files: ./app/pkg/installer_nanos.sh
273274
tag_name: ${{ steps.nanos.outputs.tag_name }}
@@ -284,7 +285,6 @@ jobs:
284285
test_zemu,
285286
rust_tests,
286287
]
287-
if: ${{ github.ref == 'refs/heads/main' }}
288288
runs-on: ubuntu-latest
289289
container:
290290
image: zondax/ledger-app-builder:latest
@@ -328,10 +328,11 @@ jobs:
328328
id: nanosp
329329
run: echo "tag_name=$(./app/pkg/installer_nanos_plus.sh version)" >> $GITHUB_OUTPUT
330330
- name: Update Release
331+
if: ${{ github.ref == 'refs/heads/main' }}
331332
id: update_release_2
332333
uses: softprops/action-gh-release@v1
333334
env:
334-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
335+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
335336
with:
336337
files: ./app/pkg/installer_nanos_plus.sh
337338
tag_name: ${{ steps.nanosp.outputs.tag_name }}
@@ -348,7 +349,6 @@ jobs:
348349
test_zemu,
349350
rust_tests,
350351
]
351-
if: ${{ github.ref == 'refs/heads/main' }}
352352
runs-on: ubuntu-latest
353353
container:
354354
image: zondax/ledger-app-builder:latest
@@ -383,7 +383,6 @@ jobs:
383383
${{ runner.os }}-rust-
384384
- name: Install rust-src component
385385
run: rustup component add rust-src --toolchain stable-x86_64-unknown-linux-gnu
386-
387386
- name: Build Stax
388387
shell: bash -l {0}
389388
run: |
@@ -392,10 +391,11 @@ jobs:
392391
id: stax
393392
run: echo "tag_name=$(./app/pkg/installer_stax.sh version)" >> $GITHUB_OUTPUT
394393
- name: Update Release
394+
if: ${{ github.ref == 'refs/heads/main' }}
395395
id: update_release_2
396396
uses: softprops/action-gh-release@v1
397397
env:
398-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
398+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
399399
with:
400400
files: ./app/pkg/installer_stax.sh
401401
tag_name: ${{ steps.stax.outputs.tag_name }}
@@ -412,7 +412,6 @@ jobs:
412412
test_zemu,
413413
rust_tests,
414414
]
415-
if: ${{ github.ref == 'refs/heads/main' }}
416415
runs-on: ubuntu-latest
417416
container:
418417
image: zondax/ledger-app-builder:latest
@@ -447,7 +446,6 @@ jobs:
447446
${{ runner.os }}-rust-
448447
- name: Install rust-src component
449448
run: rustup component add rust-src --toolchain stable-x86_64-unknown-linux-gnu
450-
451449
- name: Build Flex
452450
shell: bash -l {0}
453451
run: |
@@ -456,10 +454,11 @@ jobs:
456454
id: flex
457455
run: echo "tag_name=$(./app/pkg/installer_flex.sh version)" >> $GITHUB_OUTPUT
458456
- name: Update Release
457+
if: ${{ github.ref == 'refs/heads/main' }}
459458
id: update_release_2
460459
uses: softprops/action-gh-release@v1
461460
env:
462-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
461+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
463462
with:
464463
files: ./app/pkg/installer_flex.sh
465464
tag_name: ${{ steps.flex.outputs.tag_name }}

app/Makefile.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ APPVERSION_M=4
33
# This is the minor version of this release
44
APPVERSION_N=0
55
# This is the patch version of this release
6-
APPVERSION_P=3
6+
APPVERSION_P=4

app/rust/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#![no_builtins]
33
#![macro_use]
44
#![allow(dead_code)]
5-
#![deny(unused_crate_dependencies)]
65
// We used different config flags names
76
// in order to not possibly colide with other
87
// defined in dependencies

app/rust/src/parser/consent_message/msg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ impl<'a> FromCandidHeader<'a> for ConsentMessage<'a> {
212212
let total_size = fields_start.len() - current.len();
213213

214214
// Take only the fields content from the correct position
215-
let (rem, fields) = take(total_size)(fields_start)?;
215+
let (_rem, fields) = take(total_size)(fields_start)?;
216216

217217
// Continue parsing from where we left off
218218
let rem = current;
-208 Bytes
Loading
-208 Bytes
Loading
1 Byte
Loading
1 Byte
Loading
-3 Bytes
Loading
-3 Bytes
Loading

0 commit comments

Comments
 (0)