diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 856d0a8..9da3932 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -20,7 +20,7 @@ release-arch make arch-linux release package # make full build make -f Makefile.dev release-1.0.0 # push release -git push origin master --tags +git push origin main --tags # create release from tag on github # attach .tar.gz to the github release make -f Makefile.dev release-arch @@ -137,4 +137,4 @@ make -f Makefile.dev release-arch - [ ] Play from record text file - [ ] Fixes - [ ] Try to write NanoKontrol config - - [x] Investigate video device fps loss (bad unregister ?) \ No newline at end of file + - [x] Investigate video device fps loss (bad unregister ?) diff --git a/Makefile.dev b/Makefile.dev index 64930fa..904d66c 100644 --- a/Makefile.dev +++ b/Makefile.dev @@ -82,7 +82,7 @@ test-release: clean clean-release .PHONY: release-% release-%: clean clean-release - git pull origin master + git pull origin main sed -i -E "s/[0-9]+\\.[0-9]+\\.[0-9]+/$*/g" configure.ac aclocal autoconf @@ -95,8 +95,8 @@ release-%: clean clean-release sha256sum build/forge-steel-$*.tar.gz | cut -d' ' -f1 | xargs -I{} sed -i -E "s/sha256sums=\\('.*'\\)/sha256sums=\\('{}'\\)/g" PKGBUILD git add configure.ac PKGBUILD git commit -am "forge (steel) v$*" - git tag v$* -m "forge (steel) v$*" - @echo "Push release: git push origin master --tags" + git tag v$* -m "FORGE steel-$*" + @echo "Push release: git push origin main --tags" @echo "Rollback release: git reset HEAD~1 --hard && git tag -d v$*"