Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #661 from virtualtam/release/archive

Browse source 
Update release archive generation
This commit is contained in:
VirtualTam 2016-10-19 20:03:47 +02:00 committed by GitHub
commit 918bd5b912
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
CHANGELOG.md
View file

@ -6,23 +6,26 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
## [v0.8.1](https://github.com/shaarli/Shaarli/releases/tag/v0.8.1) - UNPUBLISHED ## [v0.8.1](https://github.com/shaarli/Shaarli/releases/tag/v0.8.1) - UNPUBLISHED
## Added ### Added
- Add CHANGELOG.md to track the whole project's history - Add CHANGELOG.md to track the whole project's history
- Save the last edition date for shaares and use it in Atom/RSS feeds - Save the last edition date for shaares and use it in Atom/RSS feeds
- Plugins: - Plugins:
- Add an [Isso](https://posativ.org/isso/) plugin to enable user comments on permalinks - Add an [Isso](https://posativ.org/isso/) plugin to enable user comments on permalinks
- Allow defining init functions, e.g. for performing checks and error processing - Allow defining init functions, e.g. for performing checks and error processing
## Changed ### Changed
- Cleanup `{loop}` declarations in templates - Cleanup `{loop}` declarations in templates
- Release archives now have the same structure as GitHub-generated archives:
- archives contain a `Shaarli` directory, itself containing sources + dependencies
- the tarball is now gzipped
## Fixed ### Fixed
- Fix the server `<self>` value in Atom/RSS feeds - Fix the server `<self>` value in Atom/RSS feeds
- Plugins: - Plugins:
- Tools: only display parameter description when it exists - Tools: only display parameter description when it exists
- archive.org: do not propose archival of private notes - archive.org: do not propose archival of private notes
## Security ### Security
- Allow whitelisting trusted IPs, else continue banning clients upon login failure - Allow whitelisting trusted IPs, else continue banning clients upon login failure

13
Makefile
View file

@ -137,6 +137,7 @@ test:
# to ease deployment on shared hosting. # to ease deployment on shared hosting.
## ##
ARCHIVE_VERSION := shaarli-$$(git describe)-full ARCHIVE_VERSION := shaarli-$$(git describe)-full
ARCHIVE_PREFIX=Shaarli/
release_archive: release_tar release_zip release_archive: release_tar release_zip
@ -147,13 +148,17 @@ composer_dependencies: clean
### generate a release tarball and include 3rd-party dependencies ### generate a release tarball and include 3rd-party dependencies
release_tar: composer_dependencies release_tar: composer_dependencies
git archive -o $(ARCHIVE_VERSION).tar HEAD git archive --prefix=$(ARCHIVE_PREFIX) -o $(ARCHIVE_VERSION).tar HEAD
tar rvf $(ARCHIVE_VERSION).tar vendor/ tar rvf $(ARCHIVE_VERSION).tar --transform "s|^vendor|$(ARCHIVE_PREFIX)vendor|" vendor/
gzip $(ARCHIVE_VERSION).tar
### generate a release zip and include 3rd-party dependencies ### generate a release zip and include 3rd-party dependencies
release_zip: composer_dependencies release_zip: composer_dependencies
git archive -o $(ARCHIVE_VERSION).zip -9 HEAD git archive --prefix=$(ARCHIVE_PREFIX) -o $(ARCHIVE_VERSION).zip -9 HEAD
zip -r $(ARCHIVE_VERSION).zip vendor/ mkdir $(ARCHIVE_PREFIX)
rsync -a vendor/ $(ARCHIVE_PREFIX)vendor/
zip -r $(ARCHIVE_VERSION).zip $(ARCHIVE_PREFIX)vendor/
rm -rf $(ARCHIVE_PREFIX)
## ##
# Targets for repository and documentation maintenance # Targets for repository and documentation maintenance