@@ -144,23 +144,24 @@ test-bindings: $(TEST-BINDINGS)
144144serve 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
149149else
150- release : release-check realclean release-pull release -yamlscript
150+ release : release-check realclean release-pull _release -yamlscript
151151endif
152152
153153release-check :
154154ifndef 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)
157157endif
158158ifndef YS_GH_TOKEN
159159 $(error YS release requires YS_GH_TOKEN to be set)
160160endif
161161ifndef YS_GH_USER
162162 $(error YS release requires YS_GH_USER to be set)
163163endif
164+ endif
164165ifndef d
165166ifndef RELEASE-ID
166167ifndef YS_RELEASE_VERSION_OLD
@@ -174,7 +175,6 @@ ifeq (,$(shell which yarn))
174175endif
175176endif
176177endif
177- endif
178178
179179release-pull :
180180ifndef d
@@ -188,16 +188,7 @@ ifndef d
188188 )
189189endif
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
0 commit comments