Skip to content

Commit

Permalink
build: fix make issue (#1681)
Browse files Browse the repository at this point in the history
fix make/workflow issues
  • Loading branch information
bermuell authored Mar 5, 2024
1 parent 4f6ad2c commit b99a681
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
push:
branches:
- 'main'
- 'releases/**'
- 'release/**'
tags:
- "v[0-9]+.[0-9]+.[0-9]+" # Push events matching tag versions as v3.0.0
- "v[0-9]+.[0-9]+.[0-9]+-lsm" # Push events matching '-lsm' postfix tags
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
COMMIT := $(shell git log -1 --format='%H')
# Fetch tags and get the latest ICS version by filtering tags by vX.Y.Z and vX.Y.Z-lsm
LATEST_RELEASE := $(shell git fetch; git tag -l --sort -v:refname 'v*.?' 'v*.?'-lsm 'v*.??' 'v*.??'-lsm | head -n 1)
# using lazy set to only execute commands when variable is used
LATEST_RELEASE ?= $(shell git fetch; git tag -l --sort -v:refname 'v*.?' 'v*.?'-lsm 'v*.??' 'v*.??'-lsm | head -n 1)

# don't override user values
ifeq (,$(VERSION))
Expand Down

0 comments on commit b99a681

Please sign in to comment.