From 32ddaa0b721c79cd96c77f1622099b8a409a4a86 Mon Sep 17 00:00:00 2001 From: n-peugnet Date: Wed, 23 Oct 2019 23:27:06 +0200 Subject: add release-it as the release tool --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index bef37ef..c0ccd3c 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +include .env +export PATH := vendor/bin:node_modules/.bin:$(PATH) GIT_VERSION := $(shell git --no-pager describe --always --tags) @@ -7,6 +9,9 @@ zip_release := $(GIT_VERSION:%=dist/w_cms_%.zip) all: php_dependencies $(js_bundles) +release: + release-it + dist: distclean $(zip_release) dist/w_cms_%.zip: all @@ -16,6 +21,7 @@ dist/w_cms_%.zip: all zip -d $@ \ "src*" \ .gitignore \ + .release-it.json \ composer.lock \ Makefile \ "package*" \ -- cgit v1.2.3 From 028345a48e8d81eff9139eb80630fad305387611 Mon Sep 17 00:00:00 2001 From: n-peugnet Date: Thu, 24 Oct 2019 11:26:09 +0200 Subject: fix make: add default env file en .env target --- .default.env | 4 ++++ Makefile | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 .default.env (limited to 'Makefile') diff --git a/.default.env b/.default.env new file mode 100644 index 0000000..7ab2e42 --- /dev/null +++ b/.default.env @@ -0,0 +1,4 @@ +# .env + +# GitHub token used by release-it to publish releases +GITHUB_TOKEN= \ No newline at end of file diff --git a/Makefile b/Makefile index c0ccd3c..fe78765 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,7 @@ dist/w_cms_%.zip: all git archive --format=zip HEAD -o $@ zip -d $@ \ "src*" \ + .default.env \ .gitignore \ .release-it.json \ composer.lock \ @@ -37,6 +38,9 @@ assets/js/%.bundle.js: src/%.js js_dependencies mkdir -p $(dir $@) webpack --env prod +.env: + cp .default.env .env + php_dependencies: @echo "Installing PHP dependencies..." composer install --no-dev --prefer-dist -- cgit v1.2.3 From c8a99c729334f994ab79fb2dacfaa48a119b7d74 Mon Sep 17 00:00:00 2001 From: n-peugnet Date: Sat, 26 Oct 2019 18:42:52 +0200 Subject: store version in VERSION instead of composer.json --- .release-it.json | 7 +++++-- Makefile | 1 + VERSION | 1 + app/fn/fn.php | 4 ++-- composer.json | 1 - 5 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 VERSION (limited to 'Makefile') diff --git a/.release-it.json b/.release-it.json index 9b936fc..0096671 100644 --- a/.release-it.json +++ b/.release-it.json @@ -11,10 +11,13 @@ }, "plugins": { "@release-it/bumper": { - "out": "composer.json" + "out": { + "file": "VERSION", + "type": "text/plain" + } } }, "hooks": { "after:git:release": "make dist" } -} +} \ No newline at end of file diff --git a/Makefile b/Makefile index fe78765..7ec0c46 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,7 @@ dist/w_cms_%.zip: all .default.env \ .gitignore \ .release-it.json \ + composer.json \ composer.lock \ Makefile \ "package*" \ diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..5849151 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +1.7.5 \ No newline at end of file diff --git a/app/fn/fn.php b/app/fn/fn.php index faf5b81..f5068fa 100644 --- a/app/fn/fn.php +++ b/app/fn/fn.php @@ -84,8 +84,8 @@ function idclean(string $input) function getversion() { - if(file_exists('composer.json')) { - $composer = json_decode(file_get_contents('composer.json'), true); + if(file_exists('VERSION')) { + $composer = file_get_contents('VERSION'); $version = $composer['version']; } else { $version = 'unknown'; diff --git a/composer.json b/composer.json index 803370e..b8e2b69 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,6 @@ { "name": "w-cms", "description": "point'n think", - "version": "1.7.5", "require": { "michelf/php-markdown": "^1.8", "league/plates": "3.*", -- cgit v1.2.3