From 73fa0a5d5df412e0240461daf3ac5ebc0c924770 Mon Sep 17 00:00:00 2001 From: Carlos Medeiros Date: Thu, 24 Oct 2024 15:39:40 +0100 Subject: [PATCH 1/3] fix CI to create demo installers --- .github/workflows/main.yml | 6 +++--- app/Makefile.version | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c496598..eb216c4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -144,7 +144,7 @@ jobs: - name: Build NanoS shell: bash -l {0} run: | - make + PRODUCTION_BUILD=0 make mv ./app/pkg/installer_s.sh ./app/pkg/installer_nanos.sh - name: Set tag id: nanos @@ -180,7 +180,7 @@ jobs: - name: Build NanoSP shell: bash -l {0} run: | - make + PRODUCTION_BUILD=0 make mv ./app/pkg/installer_s2.sh ./app/pkg/installer_nanos_plus.sh - name: Set tag id: nanosp @@ -216,7 +216,7 @@ jobs: - name: Build Stax shell: bash -l {0} run: | - make + PRODUCTION_BUILD=0 make - name: Set tag id: stax run: echo "tag_name=$(./app/pkg/installer_stax.sh version)" >> $GITHUB_OUTPUT diff --git a/app/Makefile.version b/app/Makefile.version index aa329cf..3fcbb4f 100644 --- a/app/Makefile.version +++ b/app/Makefile.version @@ -1,6 +1,6 @@ # This is the major version -APPVERSION_M=0 +APPVERSION_M=1 # This is the minor version -APPVERSION_N=1 +APPVERSION_N=0 # This is the patch version -APPVERSION_P=1 +APPVERSION_P=0 From 223ec414874de40656668a9026e03e7a167dc4d7 Mon Sep 17 00:00:00 2001 From: Carlos Medeiros Date: Thu, 24 Oct 2024 15:46:32 +0100 Subject: [PATCH 2/3] update deps --- tests_zemu/package.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests_zemu/package.json b/tests_zemu/package.json index 2e9155d..33039be 100644 --- a/tests_zemu/package.json +++ b/tests_zemu/package.json @@ -25,22 +25,22 @@ }, "dependencies": { "@zondax/ledger-ironfish": "../js", - "@zondax/zemu": "^0.50.3" + "@zondax/zemu": "^0.51.0" }, "devDependencies": { "@ledgerhq/hw-transport-node-hid": "^6.29.5", "@ledgerhq/logs": "^6.12.0", "@noble/curves": "^1.4.0", "@trivago/prettier-plugin-sort-imports": "^4.3.0", - "@types/jest": "^29.5.12", + "@types/jest": "^29.5.14", "@types/ledgerhq__hw-transport": "^4.21.8", - "@typescript-eslint/eslint-plugin": "^8.7.0", - "@typescript-eslint/parser": "^8.7.0", + "@typescript-eslint/eslint-plugin": "^8.11.0", + "@typescript-eslint/parser": "^8.11.0", "blakejs": "^1.2.1", "crypto-js": "4.2.0", - "eslint": "^9.5.0", + "eslint": "^9.13.0", "eslint-config-prettier": "^9.1.0", - "eslint-plugin-import": "^2.29.1", + "eslint-plugin-import": "^2.31.0", "eslint-plugin-jest": "^28.6.0", "eslint-plugin-prettier": "^5.1.3", "eslint-plugin-promise": "^7.1.0", @@ -51,6 +51,6 @@ "prettier": "^3.3.2", "ts-jest": "^29.1.5", "ts-node": "^10.9.2", - "typescript": "^5.5.2" + "typescript": "^5.6.3" } } From 88f564d435db9b782b6016851669fade77fc4cd7 Mon Sep 17 00:00:00 2001 From: Carlos Medeiros Date: Thu, 24 Oct 2024 15:46:42 +0100 Subject: [PATCH 3/3] update snapshots --- tests_zemu/snapshots/fl-mainmenu/00004.png | Bin 8812 -> 8801 bytes tests_zemu/snapshots/sp-mainmenu/00004.png | Bin 348 -> 340 bytes tests_zemu/snapshots/sp-mainmenu/00010.png | Bin 348 -> 340 bytes tests_zemu/snapshots/st-mainmenu/00004.png | Bin 10657 -> 10686 bytes tests_zemu/snapshots/x-mainmenu/00004.png | Bin 348 -> 340 bytes tests_zemu/snapshots/x-mainmenu/00010.png | Bin 348 -> 340 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/tests_zemu/snapshots/fl-mainmenu/00004.png b/tests_zemu/snapshots/fl-mainmenu/00004.png index 1cf639387e1fcc9b1ae84d01b6422d971a74a4f0..13ef5c0ff13520c36012b1416f9db5fe78f56717 100644 GIT binary patch literal 8801 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 BBDDYj literal 8812 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 NQBPMtmvv4FO#spUnE!-1wRF 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 literal 10657 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 Bq`d$D diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png index 530e2ea7cccabe16f383e6d910428229ea4f7614..fdbf414879c4504bf5145e73d4b50fa1ff5395d6 100644 GIT binary patch delta 313 zcmcb^bcJbxO1-qFi(^Q|oVPb)g_;$3+yZaC^xO1bHC4YhAw@&sXqVd6>UnE!-1wRF zQJ;kY0SY?W-@XeqZBbAPezhd%@21UVR!2|&V)qGPf2DFquup2iDy2!wBW121H7l%* zTDLz!gmZrH%I?_}Qtx(8Yu_rC^v3bmjA^b*gj4HnUpIxA%l5Obv&eO@wSP0y@Ym+aYd100^-Y|}eM)fGjmY#a{g1yq{~ro-R{ML|WRcq6 z$rqWu&p1u9;E(?GzQVeE^M2mMW{D)@Q;#a|JeVLX_r9fj!<;+LvPY7cyV}o$_u75B z(Gb0m@tDkBL8H^6>yITYsQekR-zYopjwBPpj|}D?+15FVdQ&MBb@ E0RM=Ik40p>h?vll>(SULS0^&%znJP|#`X&*4_Y~|IU=q8SALs>(aZQWwX93~ zC2T(&(RtGOdBgJR+{jqp%4TK3{l#s~wLMb56Sx0le=_aL@|JTaEkC95BmBy+lT@7CT!{; NQBPMtmvv4FO#spUnE!-1wRF zQJ;kY0SY?W-@XeqZBbAPezhd%@21UVR!2|&V)qGPf2DFquup2iDy2!wBW121H7l%* zTDLz!gmZrH%I?_}Qtx(8Yu_rC^v3bmjA^b*gj4HnUpIxA%l5Obv&eO@wSP0y@Ym+aYd100^-Y|}eM)fGjmY#a{g1yq{~ro-R{ML|WRcq6 z$rqWu&p1u9;E(?GzQVeE^M2mMW{D)@Q;#a|JeVLX_r9fj!<;+LvPY7cyV}o$_u75B z(Gb0m@tDkBL8H^6>yITYsQekR-zYopjwBPpj|}D?+15FVdQ&MBb@ E0RM=Ik40p>h?vll>(SULS0^&%znJP|#`X&*4_Y~|IU=q8SALs>(aZQWwX93~ zC2T(&(RtGOdBgJR+{jqp%4TK3{l#s~wLMb56Sx0le=_aL@|JTaEkC95BmBy+lT@7CT!{; NQBPMtmvv4FO#sp