Skip to content

CI: update environment configuration #298

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.

Sign up for GitHub

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

Merged
lihuanhuan merged 1 commit into from
Apr 18, 2025
Merged

CI: update environment configuration #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-pro.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
build-pro:
name: "Build Pro (${{ matrix.artifact_suffix }})"
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
outputs:
firmware_version: ${{ steps.vars.outputs.firmware_version }}
boot_version: ${{ steps.vars.outputs.boot_version }}
Expand Down
9 changes: 4 additions & 5 deletions core/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,18 @@ BOOT_BUILD_VERSION=$(shell ../tools/version.sh ./embed/bootloader/version.h)
FIRMWARE_BUILD_VERSION=$(shell cat ./embed/firmware/version.h | grep -E '#define ONEKEY_VERSION_(MAJOR|MINOR|PATCH)' | awk '{printf "%s.", $$3}' | sed 's/\.$$//')
ifndef BUILD_ID
BUILD_COMMIT=$(shell git rev-parse HEAD | cut -c1-7)
ifeq ($(BITCOIN_ONLY), 1)
FIRMWARE_BUILD_NAME=pro.$(FIRMWARE_BUILD_VERSION)-Stable-bc-only-$(BUILD_DATE)-$(BUILD_COMMIT)
else
FIRMWARE_BUILD_NAME=pro.$(FIRMWARE_BUILD_VERSION)-Stable-$(BUILD_DATE)-$(BUILD_COMMIT)
endif
BOOT_BUILD_NAME=pro.bootloader.$(BOOT_BUILD_VERSION)-Stable-$(BUILD_DATE)-$(BUILD_COMMIT)
else
FIRMWARE_BUILD_NAME=pro.$(FIRMWARE_BUILD_VERSION)-Alpha-$(BUILD_DATE)-$(BUILD_ID)
BOOT_BUILD_NAME=pro.bootloader.$(BOOT_BUILD_VERSION)-Alpha-$(BUILD_DATE)-$(BUILD_ID)
endif
CFLAGS += -DBUILD_COMMIT='\"$(BUILD_COMMIT)\"'


ifeq ($(BITCOIN_ONLY), 1)
FIRMWARE_BUILD_NAME:=$(FIRMWARE_BUILD_NAME)-bc_only
endif

TESTPATH = $(CURDIR)/../tests

EMU = $(CURDIR)/emu.py
Expand Down
Loading