diff --git a/.gitea/workflows/avr-build.yaml b/.gitea/workflows/avr-build.yaml index f39261e..658075c 100644 --- a/.gitea/workflows/avr-build.yaml +++ b/.gitea/workflows/avr-build.yaml @@ -36,7 +36,6 @@ jobs: echo "PREFIX=ENO" >> $GITHUB_ENV fi - echo "VERSION=${GITHUB_SHA::7}" >> $GITHUB_ENV - name: Code check run: cppcheck --enable=all --inconclusive src \ @@ -47,7 +46,7 @@ jobs: - name: Build firmware run: | - make BUILD_TYPE=$BUILD_TYPE PREFIX=$PREFIX VERSION=$VERSION + make BUILD_TYPE=$BUILD_TYPE PREFIX=$PREFIX - name: Publish HEX to binaries repo diff --git a/makefile b/makefile index ba7da87..94cfa21 100644 --- a/makefile +++ b/makefile @@ -2,7 +2,7 @@ MCU ?= atmega644pa F_CPU ?= 8000000UL BUILD_TYPE ?= dev -VERSION ?= 0.1 +VERSION := $(shell cat VERSION.txt | tr -d ' \t\r\n') PREFIX ?= ENO CC = avr-gcc @@ -19,7 +19,7 @@ all: $(TARGET).hex $(TARGET).elf: $(SRC) @mkdir -p $(OUTDIR) - $(CC) $(CFLAGS) $< -o $@ //avr-gcc -mmcu=atmega644pa .... + $(CC) $(CFLAGS) $< -o $@ $(TARGET).hex: $(TARGET).elf $(OBJCOPY) -O ihex -R .eeprom $< $@