Skip to content

Commit c0f8cfb

Browse files
committed
make: Switch release branch from main to v0
1 parent 0ec67ad commit c0f8cfb

File tree

2 files changed

+10
-18
lines changed

2 files changed

+10
-18
lines changed

Makefile

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -144,23 +144,24 @@ test-bindings: $(TEST-BINDINGS)
144144
serve publish:
145145
$(MAKE) -C www $@
146146

147-
ifdef s
148-
release: release-check release-yamlscript
147+
ifneq (or $s,$(YS_RELEASE_NO_CHECK))
148+
release: release-check _release-yamlscript
149149
else
150-
release: release-check realclean release-pull release-yamlscript
150+
release: release-check realclean release-pull _release-yamlscript
151151
endif
152152

153153
release-check:
154154
ifndef YS_RELEASE_NO_CHECK
155-
ifneq (main,$(shell git rev-parse --abbrev-ref HEAD))
156-
$(error Must be on branch 'main' to release)
155+
ifneq (v0,$(shell git rev-parse --abbrev-ref HEAD))
156+
$(error Must be on branch 'v0' to release)
157157
endif
158158
ifndef YS_GH_TOKEN
159159
$(error YS release requires YS_GH_TOKEN to be set)
160160
endif
161161
ifndef YS_GH_USER
162162
$(error YS release requires YS_GH_USER to be set)
163163
endif
164+
endif
164165
ifndef d
165166
ifndef RELEASE-ID
166167
ifndef YS_RELEASE_VERSION_OLD
@@ -174,7 +175,6 @@ ifeq (,$(shell which yarn))
174175
endif
175176
endif
176177
endif
177-
endif
178178

179179
release-pull:
180180
ifndef d
@@ -188,16 +188,7 @@ ifndef d
188188
)
189189
endif
190190

191-
release-yamlscript: $(YS)
192-
ifndef YS_RELEASE_NO_CHECK
193-
ifneq (main, $(shell git rev-parse --abbrev-ref HEAD))
194-
$(error You must be on the 'main' branch to release)
195-
endif
196-
@[[ $$YS_GH_USER ]] || { \
197-
echo 'Please export YS_GH_USER'; exit 1; }
198-
@[[ $$YS_GH_TOKEN ]] || { \
199-
echo 'Please export YS_GH_TOKEN'; exit 1; }
200-
endif
191+
_release-yamlscript: $(YS)
201192
(time $< $(ROOT)/util/release-yamlscript $o $n $s) 2>&1 | \
202193
tee -a $(RELEASE-LOG)
203194

@@ -288,3 +279,4 @@ distclean-%: %
288279

289280
sysclean:: realclean
290281
$(RM) -r $(ROOT)/.cache/
282+
$(RM) -r $(ROOT)/.clj-kondo/.cache/

common/vars.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
YS-VERSION := 0.1.97
2-
31
include $(MAKES)/graalvm.mk
42
include $(MAKES)/maven.mk
3+
# This is the previously released `ys` version suitable for internal tasks:
4+
YS-VERSION := 0.1.97
55
include $(MAKES)/ys.mk
66

77
export TMPDIR := $(LOCAL-TMP)

0 commit comments

Comments
 (0)