Take version from repo and not from CI [skip CI]

cbcrg · Jun 8, 2023 · 99beaec · 99beaec
1 parent 03e2777
commit 99beaec
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -70,7 +70,8 @@ jobs:
         # Note that since the distribution is usually triggered by the "git push" in "make release", the basic elements (doc, source and binary of the machine in which make release was launched) should already be published
         #
         if [[ $RELEASE == 1 ]]; then MODE=Stable; else MODE=Beta; fi;
-        version=$(cat ~/publish/sandbox/.version);
+        # version=$(cat ~/publish/sandbox/.version); # version is increased by the CI build
+        version=$(cat ~/tcoffee/lib/version/version_number.version);
         macosx_bversion=$(cat ~/tcoffee/binaries/macosx/version_number.version);
         linux_bversion=$(cat ~/tcoffee/binaries/linux/version_number.version);
         cp ~/tcoffee/build/web-readme.txt ~/publish/sandbox/distributions/$MODE/$version/readme.txt

diff --git a/t_coffee/src/makefile b/t_coffee/src/makefile
@@ -16,7 +16,8 @@ SHELL := /bin/bash
 
 type=beta
 test=core
-m='undocumented beta release tested with $(type) tests'
+# move below to include the version tag
+# m='undocumented beta release tested with $(type) tests'
 
 
 
@@ -423,6 +424,8 @@ release2:
 	sphinx-build -b singlehtml $(RST_DOC) $(HTML_DOC)
 	make distribution VERSION=$(VERSION)
 	make web
+
+	m='Undocumented beta release tested with $(type) tests - $(VERSION)'
 
 	# Stage all modified files (excluding untracked files)
 	git add -u
@@ -436,19 +439,19 @@ release2:
 
 # This part could be removed just maitained to upload stuff to dropbox
 web:
-	# # Docs are published by CI using the build there
-	# rm -f $(WEB_DOC)/*.html
-	# cp -r $(HTML_DOC)/* $(WEB_DOC)
+	# Docs are published by CI using the build there
+	rm -f $(WEB_DOC)/*.html
+	cp -r $(HTML_DOC)/* $(WEB_DOC)
 
-	# # Mac Binaries are published by CI using the binaries produced here and pushed to github
-	# cp $(EXECUTABLE_DIR)/$(EXECUTABLE) $(WEB_BIN_DIR)/$(EXECUTABLE).$(VERSION);
+	# Mac Binaries are published by CI using the binaries produced here and pushed to github
+	cp $(EXECUTABLE_DIR)/$(EXECUTABLE) $(WEB_BIN_DIR)/$(EXECUTABLE).$(VERSION);
 
-	# # Distribution are archived in CI from latest to archives in each release
-	# mkdir -p $(WEB_ARCHIVE_SOURCES)
-	# cp $(LATEST_DISTRIBUTIONS)/$(LATEST_DISTRIBUTION_FILE).tar.gz $(WEB_ARCHIVE_SOURCES)/$(PROGRAM)_distribution_$(shell $(PERL4MAKEFILE_LIB)/read_program_version.pl -path=$(VER_DIR) -print).tar.gz
+	# Distribution are archived in CI from latest to archives in each release
+	mkdir -p $(WEB_ARCHIVE_SOURCES)
+	cp $(LATEST_DISTRIBUTIONS)/$(LATEST_DISTRIBUTION_FILE).tar.gz $(WEB_ARCHIVE_SOURCES)/$(PROGRAM)_distribution_$(shell $(PERL4MAKEFILE_LIB)/read_program_version.pl -path=$(VER_DIR) -print).tar.gz
 
-	# # Done by CI
-	# cp $(LIB_DIR)/version/version_number.version  $(WEB_DIR)/Packages/T-COFFEE.version
+	# Done by CI
+	cp $(LIB_DIR)/version/version_number.version  $(WEB_DIR)/Packages/T-COFFEE.version
 
 #
 # Include the main T-Coffee makefile