Skip to content

Commit

Permalink
Update documenation about publish new versions (#422)
Browse files Browse the repository at this point in the history
* Change publish job in Makefile to not push into main

* Makefile requries tabs instead spaces
  • Loading branch information
albig committed Nov 3, 2023
1 parent 11da373 commit 8aaff8c
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[{Makefile,**.mk}]
# Use tabs for indentation (Makefiles require tabs)
indent_style = tab
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,11 @@ publish:
@read -p "which version do you want to publish now (start with number, NO v): " newversion; \
sed -i "s/Version.*/Version:\ $$newversion/" "sass/style.scss" && \
php create-changelog.php $$newversion && \
git checkout -B deploy && \
git add sass/style.scss changelog.html && git commit -m "publishing version $$newversion" && \
git tag "v$$newversion"
git push && git push --tags
make deploy
git push
# git tag "v$$newversion"
# git push && git push --tags


mkdocs-serve:
Expand Down
6 changes: 6 additions & 0 deletions mkdocs/docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,9 @@ Fertig.
Das Deployment läuft über GitHub Actions. Beim Erstellen eines Releases wird das CSS und JavaScript gebaut und das ZIP-Archiv gepackt und auf dem Updateserver https://sunflower-theme.de kopiert.

Wichtig: Vor dem Release die Versions-Nummer in `sass/style.scss` anpassen!

Dazu kann man den Schritt `publish` des Makefiles nutzen:

`make publish`

Dadurch wird ein neuer Branch `deploy` angelegt, die Versions-Nummer in `sass/style.scss` gesetzt, das Changelog aktualisiert und der Branch gepusht.

0 comments on commit 8aaff8c

Please sign in to comment.