change how to tag

roswell · Sep 7, 2024 · a324353 · a324353
1 parent d14dd49
commit a324353
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         lisp: [sbcl-bin/2.0.0]

diff --git a/Makefile b/Makefile
@@ -17,13 +17,12 @@ VARIANT ?=
 CLISP_LDFLAGS ?=
 DOCKER_REPO ?= docker.pkg.github.com/roswell/sbcl_bin
 PACK=clisp-$(VERSION)-$(CPU)-$(OS)$(VARIANT)
-LAST_VERSION=`ros web.ros version`
-
+LAST_VERSION=$(shell ros web.ros version)
 hash:
 	git ls-remote --heads $(ORIGIN_URI) $(ORIGIN_REF) |sed -E "s/^([0-9a-fA-F]*).*/\1/" > hash
 
 lasthash: web.ros
-	curl -sfSL -o lasthash $(GITHUB)/releases/download/$(LAST_VERSION)/hash
+	curl -sfSL -o lasthash $(GITHUB)/releases/download/files/hash || touch lasthash
 
 latest-version: lasthash version
 	$(eval VERSION := $(shell cat version))
@@ -34,7 +33,8 @@ download: lasthash libsigsegv-$(SIGSEGV_VERSION).tar.gz libffcall-$(FFCALL_VERSI
 
 upload-hash: hash web.ros
 	($(MAKE) lasthash  && diff -u hash lasthash) || \
-	VERSION=$(VERSION) ros web.ros upload-hash
+	( VERSION=$(VERSION) ros web.ros upload-hash; \
+	  VERSION=files ros web.ros upload-hash)
 
 tsv: web.ros
 	TSV_FILE=$(TSV_FILE) ros web.ros tsv