diff --git a/.github/workflows/make-dist.yml b/.github/workflows/make-dist.yml index e7fb709..d30de68 100644 --- a/.github/workflows/make-dist.yml +++ b/.github/workflows/make-dist.yml @@ -23,10 +23,6 @@ jobs: echo "VERSION=$(make version)" >> $GITHUB_ENV make dist CTAN - - name: Version - run: | - echo "::notice:: VERSION=${{ env.VERSION }}" - - name: Release uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/') @@ -67,14 +63,14 @@ jobs: defining a set of parameters, meta-macros, macros and environments with reasonable defaults to help typeset, build and print books mainly based on visual/image content. - announcement: > - I'm happy to announce the initial release on CTAN of the - photobook document class. - - The photobook class extends the book class defining a set - of parameters, meta-macros, macros and environments with - reasonable defaults to help typeset, build and print books - mainly based on visual/image content. + #announcement: > + # I'm happy to announce the initial release on CTAN of the + # photobook document class. + # + # The photobook class extends the book class defining a set + # of parameters, meta-macros, macros and environments with + # reasonable defaults to help typeset, build and print books + # mainly based on visual/image content. diff --git a/Makefile b/Makefile index 5bc34fc..18891f2 100644 --- a/Makefile +++ b/Makefile @@ -245,11 +245,6 @@ version: @echo $(VERSION) -.PHONY: tag -tag: - git tag "$(VERSION)" - - #---------------------------------------------------------------------- # Main targets... @@ -272,10 +267,6 @@ manual: mv manual/*.pdf . -%.zipnote: %.zip - zipnote $< > $@ - - .PHONY: dist dist: $(DIST_FILES) $(MD) $(DIST_DIR) @@ -285,9 +276,23 @@ dist: $(DIST_FILES) | sed 's/^\@ \([^(].*\)$$/@ \1\n@=$(MODULE)\/\1/' \ | zipnote -w $(DIST_DIR)/$(DIST_NAME).zip -CTAN: dist - $(MD) $(DIST_DIR)/CTAN - cp $(DIST_DIR)/$(DIST_NAME).zip $(DIST_DIR)/CTAN/$(MODULE).zip + +.PHONY: tag +tag: + @echo "Will create and publish git tag:" + @echo " $(VERSION)" + @echo "Last 5 tags:" + @git tag -l '[0-9]*'\ + | tail -n 5 \ + | sed 's/^/ /' + @echo "Note that this must be done after a commit." + @read -p "(press any key to continue or ctrl-c to cancel)" + git tag "$(VERSION)" + git commit origin "$(VERSION)" + + +#.PHONY: publish +#publish: dist .PHONY: all