Skip to content

Commit

Permalink
Unify app versioning (#222)
Browse files Browse the repository at this point in the history
* unify app versioning

* enable production build flag

* minimum stack size

* bump version & update snapshots

* delete old tests snapshots
  • Loading branch information
ftheirs authored Jun 27, 2024
1 parent f00b767 commit 21eb6a4
Show file tree
Hide file tree
Showing 190 changed files with 18 additions and 24 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ jobs:
- name: Build NanoS
shell: bash -l {0}
run: |
COIN=DOT_MIGRATION make
make
PRODUCTION_BUILD=0 COIN=DOT_MIGRATION make
PRODUCTION_BUILD=0 make
mv ./app/pkg/installer_s.sh ./app/pkg/installer_nanos.sh
mv ./app/pkg/migration_s.sh ./app/pkg/migration_nanos.sh
- name: Set tag
Expand Down Expand Up @@ -165,8 +165,8 @@ jobs:
- name: Build NanoSP
shell: bash -l {0}
run: |
COIN=DOT_MIGRATION make
make
PRODUCTION_BUILD=0 COIN=DOT_MIGRATION make
PRODUCTION_BUILD=0 make
mv ./app/pkg/installer_s2.sh ./app/pkg/installer_nanos_plus.sh
mv ./app/pkg/migration_s2.sh ./app/pkg/migration_nanos_plus.sh
- name: Set tag
Expand Down Expand Up @@ -205,8 +205,8 @@ jobs:
- name: Build Stax
shell: bash -l {0}
run: |
COIN=DOT_MIGRATION make
make
PRODUCTION_BUILD=0 COIN=DOT_MIGRATION make
PRODUCTION_BUILD=0 make
- name: Set tag
id: stax
run: echo "tag_name=$(./app/pkg/installer_stax.sh version)" >> $GITHUB_OUTPUT
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ifeq ($(BOLOS_SDK),)
# When not using the SDK, we override and build the XL complete app

ZXLIB_COMPILE_STAX ?= 1
PRODUCTION_BUILD ?= 0
PRODUCTION_BUILD ?= 1
$(info ************ COIN = [$(COIN)])
include $(CURDIR)/deps/ledger-zxlib/dockerized_build.mk

Expand All @@ -41,6 +41,6 @@ build_all:

test_all:
make zemu_install
PRODUCTION_BUILD=1 COIN=DOT_MIGRATION make
PRODUCTION_BUILD=1 make
COIN=DOT_MIGRATION make
make
make zemu_test
13 changes: 8 additions & 5 deletions app/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ MY_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
include $(BOLOS_SDK)/Makefile.defines

# # Set the default value for HAVE_SWAP to undefined if not already defined
# HAVE_SWAP ?=
# HAVE_SWAP ?=

# Set the default value for PRODUCTION_BUILD to 0 if not already defined
PRODUCTION_BUILD ?= 0
PRODUCTION_BUILD ?= 1

# Display the target name
$(info ************ TARGET_NAME = [$(TARGET_NAME)])
Expand Down Expand Up @@ -56,10 +56,7 @@ ifndef COIN
COIN=DOT
endif

ifeq ($(COIN),DOT)
include $(CURDIR)/Makefile.version
endif

$(info COIN = [$(COIN)])

APPPATH = "44'/354'"
Expand Down Expand Up @@ -92,6 +89,12 @@ $(info PATHS LIST = $(APPPATH))

APP_LOAD_PARAMS = --curve ed25519 $(COMMON_LOAD_PARAMS) --path $(APPPATH)

ifeq ($(TARGET_NAME),TARGET_NANOS)
APP_STACK_MIN_SIZE := 1600
else
APP_STACK_MIN_SIZE := 1752
endif

include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.devices

DEFAULT_ICON = nanos_$(ICON_NAME).gif
Expand Down
9 changes: 0 additions & 9 deletions app/Makefile.migration
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#*******************************************************************************

# Versioning for Migration app
# This is the `transaction_version` field of `Runtime`
APPVERSION_M=100
# This is the `spec_version` field of `Runtime`
APPVERSION_N=0
# This is the patch version of this release
APPVERSION_P=1

# Declare here all the allowed paths in migration app

PATHS := "44'/434'" "44'/295'" "44'/523'" "44'/537'" "44'/594'" "44'/595'" "44'/617'" "44'/631'" \
Expand Down
2 changes: 1 addition & 1 deletion app/Makefile.version
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ APPVERSION_M=100
# This is the `spec_version` field of `Runtime`
APPVERSION_N=0
# This is the patch version of this release
APPVERSION_P=4
APPVERSION_P=5
Binary file removed tests_zemu/snapshots/s-balances_astar/00000.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_astar/00001.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_astar/00002.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_astar/00003.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_astar/00004.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_astar/00005.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_astar/00006.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_astar/00007.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_astar/00008.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_astar/00009.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_astar/00010.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_kusama/00000.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_kusama/00001.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_kusama/00002.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_kusama/00003.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_kusama/00004.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_kusama/00005.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_kusama/00006.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_kusama/00007.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_kusama/00008.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_kusama/00009.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_kusama/00010.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_polkadot/00000.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_polkadot/00001.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_polkadot/00002.png
Binary file not shown.
Binary file removed tests_zemu/snapshots/s-balances_polkadot/00003.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/s-balances_polkadot/00004.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/s-balances_polkadot/00005.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/s-balances_polkadot/00006.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/s-balances_polkadot/00007.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/s-balances_polkadot/00008.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/s-balances_polkadot/00009.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/s-balances_polkadot/00010.png
Diff not rendered.
Binary file modified tests_zemu/snapshots/s-mainmenu/00004.png
Binary file modified tests_zemu/snapshots/s-mainmenu/00010.png
Binary file removed tests_zemu/snapshots/s-migration-main/00000.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/s-migration-main/00001.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/s-migration-main/00002.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/s-migration-main/00003.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/s-migration-main/00004.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/s-migration-main/00005.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/s-system_remark_westend/00000.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/s-system_remark_westend/00001.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/s-system_remark_westend/00002.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/s-system_remark_westend/00003.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/s-system_remark_westend/00004.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/s-system_remark_westend/00005.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/s-system_remark_westend/00006.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/s-system_remark_westend/00007.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/s-system_remark_westend/00008.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/s-system_remark_westend/00009.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_astar/00000.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_astar/00001.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_astar/00002.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_astar/00003.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_astar/00004.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_astar/00005.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_astar/00006.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_astar/00007.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_astar/00008.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_astar/00009.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_astar/00010.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_kusama/00000.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_kusama/00001.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_kusama/00002.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_kusama/00003.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_kusama/00004.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_kusama/00005.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_kusama/00006.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_kusama/00007.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_kusama/00008.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_kusama/00009.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_kusama/00010.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_kusama/00011.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_polkadot/00000.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_polkadot/00001.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_polkadot/00002.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_polkadot/00003.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_polkadot/00004.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_polkadot/00005.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_polkadot/00006.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_polkadot/00007.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_polkadot/00008.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_polkadot/00009.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_polkadot/00010.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-balances_polkadot/00011.png
Diff not rendered.
Binary file modified tests_zemu/snapshots/sp-mainmenu/00004.png
Binary file modified tests_zemu/snapshots/sp-mainmenu/00010.png
Binary file removed tests_zemu/snapshots/sp-migration-main/00000.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-migration-main/00001.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-migration-main/00002.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-migration-main/00003.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-migration-main/00004.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-migration-main/00005.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-system_remark_westend/00000.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-system_remark_westend/00001.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-system_remark_westend/00002.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-system_remark_westend/00003.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-system_remark_westend/00004.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-system_remark_westend/00005.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-system_remark_westend/00006.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-system_remark_westend/00007.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-system_remark_westend/00008.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/sp-system_remark_westend/00009.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/st-balances_astar/00000.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/st-balances_astar/00001.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/st-balances_astar/00002.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/st-balances_astar/00003.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/st-balances_astar/00004.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/st-balances_astar/00005.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/st-balances_kusama/00000.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/st-balances_kusama/00001.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/st-balances_kusama/00002.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/st-balances_kusama/00003.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/st-balances_kusama/00004.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/st-balances_kusama/00005.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/st-balances_polkadot/00000.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/st-balances_polkadot/00001.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/st-balances_polkadot/00002.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/st-balances_polkadot/00003.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/st-balances_polkadot/00004.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/st-balances_polkadot/00005.png
Diff not rendered.
Binary file modified tests_zemu/snapshots/st-mainmenu/00001.png
Binary file removed tests_zemu/snapshots/st-migration-main/00000.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/st-migration-main/00001.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/st-migration-main/00002.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_astar/00000.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_astar/00001.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_astar/00002.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_astar/00003.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_astar/00004.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_astar/00005.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_astar/00006.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_astar/00007.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_astar/00008.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_astar/00009.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_astar/00010.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_kusama/00000.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_kusama/00001.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_kusama/00002.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_kusama/00003.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_kusama/00004.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_kusama/00005.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_kusama/00006.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_kusama/00007.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_kusama/00008.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_kusama/00009.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_kusama/00010.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_kusama/00011.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_polkadot/00000.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_polkadot/00001.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_polkadot/00002.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_polkadot/00003.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_polkadot/00004.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_polkadot/00005.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_polkadot/00006.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_polkadot/00007.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_polkadot/00008.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_polkadot/00009.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_polkadot/00010.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-balances_polkadot/00011.png
Diff not rendered.
Binary file modified tests_zemu/snapshots/x-mainmenu/00004.png
Binary file modified tests_zemu/snapshots/x-mainmenu/00010.png
Binary file removed tests_zemu/snapshots/x-migration-main/00000.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-migration-main/00001.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-migration-main/00002.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-migration-main/00003.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-migration-main/00004.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-migration-main/00005.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-system_remark_westend/00000.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-system_remark_westend/00001.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-system_remark_westend/00002.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-system_remark_westend/00003.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-system_remark_westend/00004.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-system_remark_westend/00005.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-system_remark_westend/00006.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-system_remark_westend/00007.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-system_remark_westend/00008.png
Diff not rendered.
Binary file removed tests_zemu/snapshots/x-system_remark_westend/00009.png
Diff not rendered.

0 comments on commit 21eb6a4

Please sign in to comment.