From 8ee042e782c13fcecade4cc7f86e9bdff9515246 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 26 Nov 2020 10:59:14 +0100 Subject: [PATCH] further work on gitlab-ci.yml --- .gitlab-ci.yml | 32 ++++++++++---------------------- .nextcloudignore | 2 ++ CHANGELOG.md | 4 ++++ Makefile | 2 +- README.md | 2 +- krankerl.toml | 3 --- l10n/.gitkeep | 0 7 files changed, 18 insertions(+), 27 deletions(-) delete mode 100644 l10n/.gitkeep diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6151cf6..6310c08 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,39 +1,27 @@ stages: - compiling - assembling - - testing - - signing - - packaging - - publishing +# - testing +# - signing +# - packaging +# - publishing -image: ubuntu:20.04 +image: ubuntu:20.10 Compile: stage: compiling script: - apt update - DEBIAN_FRONTEND="noninteractive" apt install -y npm - - npm install - - if [ "${CI_COMMIT_REF_NAME}" == "stable" ] ; then npm run build:prod ; fi - - if [ "${CI_COMMIT_REF_NAME}" != "stable" ] ; then npm run build:nightly ; fi - artifacts: - paths: - - ./src/js/Static/* - - ./src/l10n/* - - ./src/css/* + - make dev-setup + - make build-js Assemble: stage: assembling script: - - mkdir passwords - - if [ "${CI_COMMIT_REF_NAME}" == "stable" ] ; then sed -i -e "s/-BUILD//g" ./src/appinfo/info.xml ; fi - - if [ "${CI_COMMIT_REF_NAME}" != "stable" ] ; then sed -i -e "s/-BUILD/-build${CI_PIPELINE_ID}/g" ./src/appinfo/info.xml ; fi - - rsync -r --exclude="vue" --exclude="js" --exclude="scss" src/* passwords - - rsync -r src/js/Static passwords/js/ - - cp CHANGELOG.md passwords/ - artifacts: - paths: - - ./passwords + - wget https://github.com/ChristophWurst/krankerl/releases/download/v0.12.3/krankerl_0.12.3_amd64.deb + - sudo dpkg -i krankerl_0.12.3_amd64.deb + - krankerl package PHPUnit: stage: testing diff --git a/.nextcloudignore b/.nextcloudignore index 6140525..213cba5 100644 --- a/.nextcloudignore +++ b/.nextcloudignore @@ -5,6 +5,7 @@ /.gitignore /.gitlab-ci.yml /.l10nignore +/.nextcloudignore /node_modules /.npmignore /babel.config.js @@ -17,6 +18,7 @@ /screenshot.png /src /stylelint.config.js +/Release.md /.tx /utils /webpack.js diff --git a/CHANGELOG.md b/CHANGELOG.md index fc133f0..ff1ba2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ ## 1.0.1 - 2020-12 +### Added +- Support prepare a release with Krankerl + [#200](https://git.project-insanity.org/onny/nextcloud-app-radio/-/issues/200) @onny + ### Fixed - Add AGPL headers [#206](https://git.project-insanity.org/onny/nextcloud-app-radio/issues/206) @onny diff --git a/Makefile b/Makefile index 92d2d4a..41479d7 100644 --- a/Makefile +++ b/Makefile @@ -53,5 +53,5 @@ clean: clean-dev: rm -rf node_modules -appstore: +release: krankerl package diff --git a/README.md b/README.md index 5a6ce6c..c544f38 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ Contribute translations via [Transifex](https://www.transifex.com/project-insanityorg/radio-2/dashboard/)! ### Prepare a release -Consoult [Readme.md] on how to prepare a release for Gitlab and the app store. +Consoult [Release.md](Release.md) on how to prepare a release for Gitlab and the app store. ## Reporting bugs diff --git a/krankerl.toml b/krankerl.toml index fbe9a49..835889a 100644 --- a/krankerl.toml +++ b/krankerl.toml @@ -1,4 +1 @@ [package] -before_cmds = [ - 'make all' -] diff --git a/l10n/.gitkeep b/l10n/.gitkeep deleted file mode 100644 index e69de29..0000000