Skip to content

Commit

Permalink
ci,make: Add Build_NUMBER, CI ID or PR ID (#506)
Browse files Browse the repository at this point in the history
(cherry picked from commit 4243107)
  • Loading branch information
T0biii authored Oct 29, 2024
1 parent 56c5e31 commit 0fbdf67
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/firmware.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
id: compile
run: |
git checkout -b patched ${GITHUB_SHA}
make BROKEN=1 GLUON_TARGETS=${{ matrix.target }} V=s
make BROKEN=1 GLUON_TARGETS=${{ matrix.target }} BUILD_NUMBER=${{ github.event.pull_request.number && format('pr{0}', github.event.pull_request.number) || github.run_id && format('run{0}', github.run_id) }} V=s
echo "status=success" >> $GITHUB_OUTPUT
- name: Upload firmware ${{ matrix.target }}
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ ifneq (,$(shell git describe --exact-match --tags 2>/dev/null))
else
GLUON_AUTOUPDATER_BRANCH := next
EXP_FALLBACK = $(shell date '+%Y%m%d')
BUILD_NUMBER ?= $(EXP_FALLBACK)
GLUON_RELEASE := $(shell git describe --tags)~exp$(BUILD_NUMBER)
BUILD_NUMBER ?= exp$(EXP_FALLBACK)
GLUON_RELEASE := $(shell git describe --tags)~$(BUILD_NUMBER)
endif

JOBS ?= $(shell nproc)
Expand Down

0 comments on commit 0fbdf67

Please sign in to comment.