Skip to content

Commit 1b9210c

Browse files
authored
CI: update environment configuration (#298)
1 parent 6e0b3a3 commit 1b9210c

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.github/workflows/build-pro.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
jobs:
77
build-pro:
88
name: "Build Pro (${{ matrix.artifact_suffix }})"
9-
runs-on: ubuntu-20.04
9+
runs-on: ubuntu-latest
1010
outputs:
1111
firmware_version: ${{ steps.vars.outputs.firmware_version }}
1212
boot_version: ${{ steps.vars.outputs.boot_version }}

core/Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,18 @@ BOOT_BUILD_VERSION=$(shell ../tools/version.sh ./embed/bootloader/version.h)
5353
FIRMWARE_BUILD_VERSION=$(shell cat ./embed/firmware/version.h | grep -E '#define ONEKEY_VERSION_(MAJOR|MINOR|PATCH)' | awk '{printf "%s.", $$3}' | sed 's/\.$$//')
5454
ifndef BUILD_ID
5555
BUILD_COMMIT=$(shell git rev-parse HEAD | cut -c1-7)
56+
ifeq ($(BITCOIN_ONLY), 1)
57+
FIRMWARE_BUILD_NAME=pro.$(FIRMWARE_BUILD_VERSION)-Stable-bc-only-$(BUILD_DATE)-$(BUILD_COMMIT)
58+
else
5659
FIRMWARE_BUILD_NAME=pro.$(FIRMWARE_BUILD_VERSION)-Stable-$(BUILD_DATE)-$(BUILD_COMMIT)
60+
endif
5761
BOOT_BUILD_NAME=pro.bootloader.$(BOOT_BUILD_VERSION)-Stable-$(BUILD_DATE)-$(BUILD_COMMIT)
5862
else
5963
FIRMWARE_BUILD_NAME=pro.$(FIRMWARE_BUILD_VERSION)-Alpha-$(BUILD_DATE)-$(BUILD_ID)
6064
BOOT_BUILD_NAME=pro.bootloader.$(BOOT_BUILD_VERSION)-Alpha-$(BUILD_DATE)-$(BUILD_ID)
6165
endif
6266
CFLAGS += -DBUILD_COMMIT='\"$(BUILD_COMMIT)\"'
6367

64-
65-
ifeq ($(BITCOIN_ONLY), 1)
66-
FIRMWARE_BUILD_NAME:=$(FIRMWARE_BUILD_NAME)-bc_only
67-
endif
68-
6968
TESTPATH = $(CURDIR)/../tests
7069

7170
EMU = $(CURDIR)/emu.py

0 commit comments

Comments
 (0)