aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorVirtualTam <virtualtam+github@flibidi.net>2016-10-19 20:03:47 +0200
committerGitHub <noreply@github.com>2016-10-19 20:03:47 +0200
commit918bd5b9122f929268e0979063c4844e85090858 (patch)
tree16185e53c257a00a84c113c7e0da6a0e98a06fa1
parentefd07738541ce350be2a7530a3fbaaf24298230c (diff)
parentca0ed5ca42fda5b1236fe22dbd596790e9291ab2 (diff)
downloadShaarli-918bd5b9122f929268e0979063c4844e85090858.tar.gz
Shaarli-918bd5b9122f929268e0979063c4844e85090858.tar.zst
Shaarli-918bd5b9122f929268e0979063c4844e85090858.zip
Merge pull request #661 from virtualtam/release/archive
Update release archive generation
-rw-r--r--CHANGELOG.md11
-rw-r--r--Makefile13
2 files changed, 16 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23128b23..5bd16dcd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,23 +6,26 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
6 6
7 7
8## [v0.8.1](https://github.com/shaarli/Shaarli/releases/tag/v0.8.1) - UNPUBLISHED 8## [v0.8.1](https://github.com/shaarli/Shaarli/releases/tag/v0.8.1) - UNPUBLISHED
9## Added 9### Added
10- Add CHANGELOG.md to track the whole project's history 10- Add CHANGELOG.md to track the whole project's history
11- Save the last edition date for shaares and use it in Atom/RSS feeds 11- Save the last edition date for shaares and use it in Atom/RSS feeds
12- Plugins: 12- Plugins:
13 - Add an [Isso](https://posativ.org/isso/) plugin to enable user comments on permalinks 13 - Add an [Isso](https://posativ.org/isso/) plugin to enable user comments on permalinks
14 - Allow defining init functions, e.g. for performing checks and error processing 14 - Allow defining init functions, e.g. for performing checks and error processing
15 15
16## Changed 16### Changed
17- Cleanup `{loop}` declarations in templates 17- Cleanup `{loop}` declarations in templates
18- Release archives now have the same structure as GitHub-generated archives:
19 - archives contain a `Shaarli` directory, itself containing sources + dependencies
20 - the tarball is now gzipped
18 21
19## Fixed 22### Fixed
20- Fix the server `<self>` value in Atom/RSS feeds 23- Fix the server `<self>` value in Atom/RSS feeds
21- Plugins: 24- Plugins:
22 - Tools: only display parameter description when it exists 25 - Tools: only display parameter description when it exists
23 - archive.org: do not propose archival of private notes 26 - archive.org: do not propose archival of private notes
24 27
25## Security 28### Security
26- Allow whitelisting trusted IPs, else continue banning clients upon login failure 29- Allow whitelisting trusted IPs, else continue banning clients upon login failure
27 30
28 31
diff --git a/Makefile b/Makefile
index 22be0d96..60aec9a0 100644
--- a/Makefile
+++ b/Makefile
@@ -137,6 +137,7 @@ test:
137# to ease deployment on shared hosting. 137# to ease deployment on shared hosting.
138## 138##
139ARCHIVE_VERSION := shaarli-$$(git describe)-full 139ARCHIVE_VERSION := shaarli-$$(git describe)-full
140ARCHIVE_PREFIX=Shaarli/
140 141
141release_archive: release_tar release_zip 142release_archive: release_tar release_zip
142 143
@@ -147,13 +148,17 @@ composer_dependencies: clean
147 148
148### generate a release tarball and include 3rd-party dependencies 149### generate a release tarball and include 3rd-party dependencies
149release_tar: composer_dependencies 150release_tar: composer_dependencies
150 git archive -o $(ARCHIVE_VERSION).tar HEAD 151 git archive --prefix=$(ARCHIVE_PREFIX) -o $(ARCHIVE_VERSION).tar HEAD
151 tar rvf $(ARCHIVE_VERSION).tar vendor/ 152 tar rvf $(ARCHIVE_VERSION).tar --transform "s|^vendor|$(ARCHIVE_PREFIX)vendor|" vendor/
153 gzip $(ARCHIVE_VERSION).tar
152 154
153### generate a release zip and include 3rd-party dependencies 155### generate a release zip and include 3rd-party dependencies
154release_zip: composer_dependencies 156release_zip: composer_dependencies
155 git archive -o $(ARCHIVE_VERSION).zip -9 HEAD 157 git archive --prefix=$(ARCHIVE_PREFIX) -o $(ARCHIVE_VERSION).zip -9 HEAD
156 zip -r $(ARCHIVE_VERSION).zip vendor/ 158 mkdir $(ARCHIVE_PREFIX)
159 rsync -a vendor/ $(ARCHIVE_PREFIX)vendor/
160 zip -r $(ARCHIVE_VERSION).zip $(ARCHIVE_PREFIX)vendor/
161 rm -rf $(ARCHIVE_PREFIX)
157 162
158## 163##
159# Targets for repository and documentation maintenance 164# Targets for repository and documentation maintenance