Merge pull request #53 from fyne-io/correct-ci-on-master

Get correct version when building on master
fyne-io · Jul 16, 2024 · 1b8073b · 1b8073b
2 parents 96b9ae9 + 5f12a3a
commit 1b8073b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -70,6 +70,6 @@ jobs:
  ${{ matrix.target.os }} \
  ${{ matrix.target.args }} \
  -debug -no-cache \
- -image docker.io/fyneio/fyne-cross-images:dev-${{ matrix.target.os }}${{ matrix.target.arch }} \
+ -image docker.io/fyneio/fyne-cross-images:`cd ../fyne-cross-images && make version`-${{ matrix.target.os }}${{ matrix.target.arch }} \
  -name calculator${{ matrix.target.ext }}
  
diff --git a/Makefile.inc b/Makefile.inc
@@ -2,3 +2,6 @@
 VERSION := $(shell git tag --points-at HEAD | awk -v def="dev" '{print} END { if(NR==0) {print def} }')
 # REPOSITORY is the docker repository
 REPOSITORY := docker.io/fyneio/fyne-cross-images
+
+version:
+ @echo $(VERSION)