f1c9c1aee3b96538a4967314776fab96354ee03e
max
  Fri May 9 04:45:20 2025 -0700
allowing cgi-alpha builds when one is not on the master branch. This is to allow mirrors who are on the beta branch to build into the default /usr/local/apache/cgi-bin directory. Brian agreed that we do not need to check the branch for the alpha build. I am leaving the beta check in there, as that is buildmeister territory.

diff --git src/makefile src/makefile
index c5bc5ecafbc..b5d253dcf6b 100644
--- src/makefile
+++ src/makefile
@@ -1,21 +1,21 @@
 include inc/localEnvironment.mk
 include inc/common.mk
 
 all: utils cgi blatSuite
 
-alpha: check-alpha clean
+alpha: clean
 	${MAKE} utils-alpha cgi-alpha blatSuite
 
 beta: check-beta clean
 	${MAKE} cgi-beta
 
 # do a git update and clean
 update:
 	${GIT} pull
 	${MAKE} clean
 ##
 # topLibs
 ##
 TOP_LIBS = lib parasol/lib htslib
 ifneq ($(wildcard jkOwnLib/*),)
   TOP_LIBS += jkOwnLib
@@ -42,48 +42,44 @@
    HGLIB_DIRS += hg/cgilib
 endif
 
 hgLib: ${HGLIB_CHECK} | ${HGLIB_DIRS:%=%.hgLib}
 %.hgLib:
 	${MAKE} -C $*
 hgLibChecks:
 	@./hg/sqlEnvTest.sh
 
 libs: topLibs hgLib optLib
 
 cgi: libs
 	cd hg && ${MAKE} cgi
 	cd utils/bedToBigBed && ${MAKE} cgi
 
-cgi-alpha: check-alpha libs logUser
+cgi-alpha: libs logUser
 	cd hg && ${MAKE} alpha
 	cd utils/bedToBigBed && ${MAKE} alpha
 
 cgi-beta: check-beta libs logUser
 	cd hg && ${MAKE} beta
 	cd utils/bedToBigBed && ${MAKE} beta
 
 # This log file can be useful when debugging problems on the alpha and beta builds.
 logUser:
 ifeq (${IS_HGWDEV},yes)
 	echo ${USER}, $(MAKECMDGOALS), `date` >> ${CGI_BIN}/buildLog.txt
 endif
 
-check-alpha:
-	# this will fail if we are not on master or beta branch:
-	${GIT} branch | egrep '\* master|beta' > /dev/null
-
 check-beta:
 	# this will fail if we are not in a beta checkout:
 	${GIT} branch | egrep '\* v[0-9]+_branch' > /dev/null	
 
 BLAT_SUITE_DIRS = blat gfClient gfServer webBlat hg/pslPretty hg/pslReps \
 	hg/pslSort utils/nibFrag utils/faToNib utils/faToTwoBit utils/twoBitToFa \
 	utils/twoBitInfo isPcr blatz
 
 blatSuite: ${BLAT_SUITE_DIRS:%=%.blatSuite}
 
 %.blatSuite: topLibs hgLib
 	 ${MAKE} -C $*
 
 # all of these application makefiles have been updated to include use
 #	of DESTDIR and BINDIR
@@ -152,31 +148,31 @@
 # build emacs tags for all files
 .PHONY: etags-all
 etags-all:
 	find . -name '*.[ch]' | etags -
 
 UTILS_DIRS = ${DIRS} utils
 .PHONY: utils
 utils: ${UTILS_DIRS:%=%.utils} ${STD_DIRS:%=%.utils}
 
 %.utils: libs destBin hgutils
 	@${MKDIR} ${SCRIPTS}
 	${MAKE} -C $*
 
 utils-alpha: ${UTILS_DIRS:%=%.utils-alpha}
 
-%.utils-alpha: check-alpha libs destBin hgutils
+%.utils-alpha: libs destBin hgutils
 	if [ -e "$*/makefile" ] ; then ${MAKE} -C $* ; fi
 
 hgutils: libs destBin
 	cd hg && ${MAKE} utils
 
 ##  cellar archive for obsolete programs
 
 cellarDirs = cdnaAli getgene idbQuery reformat scanIntrons tracks wormAli \
 	xenoAli
 
 buildCellar: $(cellarDirs:%=%.cellar)
 
 %.cellar: libs destBin
 	cd $* && echo $* && $(MAKE)