Compare commits

..

15 Commits

Author SHA1 Message Date
7f44ad402b Merge branch 'feature/14-release_config' into dev
# Conflicts:
#	package.json
2021-04-07 19:31:18 +02:00
da3e56d9dc Merge branch 'main' into feature/14-release_config 2021-04-07 17:23:27 +00:00
2f1567e802 Changed tag name scheme
ref #14
2021-04-07 19:22:39 +02:00
d83a908db6 Updated ci token and added electron build via ci custom call
ref #14
2021-04-07 18:12:45 +02:00
96cbac2702 Revert "0.1.2"
This reverts commit 1d788671c6faf1ec7e1275a65d0eaf0dbd33d678.
2021-04-07 17:00:54 +02:00
1d788671c6 0.1.2 2021-04-07 16:59:42 +02:00
e7458c49f0 Now also triggering electron build
ref #14
2021-04-07 16:59:35 +02:00
2ec6e1c107 Merge branch 'feature/14-release_config' of git.odit.services:lfk/scanclient into feature/14-release_config 2021-04-07 16:51:47 +02:00
3c2300c09e Updated package version to the current version
ref #14
2021-04-07 16:51:46 +02:00
69ab9893d3 Updated version to the current electron version
ref #14
2021-04-07 16:51:25 +02:00
dbff163b6b Added release-it w/ config
ref #14
2021-04-07 16:50:38 +02:00
2fa6acea3a Merge branch 'dev' into main
All checks were successful
continuous-integration/drone/tag Build is passing
2021-03-19 18:49:35 +01:00
8809c583d0 Merge branch 'dev' into main
Some checks failed
continuous-integration/drone/tag Build is failing
2021-03-19 18:44:52 +01:00
f211e35517 Merge branch 'main' of https://git.odit.services/lfk/scanclient into main 2021-03-19 18:25:59 +01:00
76ccb2290e Merge pull request 'Husky pre-commit hooks 🐶' (#8) from dev into main
Reviewed-on: #8

close #4
close #5
2021-03-19 16:41:28 +00:00
3 changed files with 67 additions and 8 deletions

View File

@ -4,13 +4,20 @@ name: gitea_token
get:
path: odit-git-bot
name: apikey
---
kind: secret
name: ci_token
get:
path: odit-ci-bot
name: apikey
---
kind: pipeline
type: kubernetes
name: build
name: build:tag
steps:
- name: run build
depends_on: ["clone"]
image: node:15.11.0-alpine3.13
commands:
- apk add git zip -f
@ -18,8 +25,7 @@ steps:
- yarn build
- mkdir out
- zip -r out/dist.zip dist
- name: gitea_release
depends_on: ["run build"]
- name: gitea add packages to build
image: plugins/gitea-release
settings:
api_key:
@ -33,8 +39,12 @@ steps:
- sha512
- adler32
- crc32
when:
event: tag
- name: trigger electron build
image: idcooldi/drone-webhook
settings:
urls: https://ci.odit.services/api/repos/lfk/scanclient-electron/builds?SOURCE_TAG=${DRONE_TAG}
bearer:
from_secret: ci_token
trigger:
event:
- tag

View File

@ -250,6 +250,35 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
# release-it
**Author**: Lars Kappert
**Repo**: https://github.com/release-it/release-it
**License**: MIT
**Description**: Generic CLI tool to automate versioning and package publishing related tasks.
## License Text
MIT License
Copyright (c) 2018 Lars Kappert
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
# svelte
**Author**: Rich Harris
**Repo**: https://github.com/sveltejs/svelte

View File

@ -1,12 +1,13 @@
{
"name": "@lfk/scanclient",
"version": "0.0.0",
"version": "0.1.1",
"scripts": {
"dev": "vite",
"build": "vite build",
"format": "prettier --write --plugin-search-dir=. ./**/*.html ./**/*.svelte",
"prepare": "husky install",
"license:export": "license-exporter --markdown && git stage licenses.md"
"license:export": "license-exporter --markdown && git stage licenses.md",
"release": "release-it --only-version"
},
"devDependencies": {
"@odit/license-exporter": "^0.0.11",
@ -18,6 +19,7 @@
"husky": "^5.1.3",
"prettier": "^2.2.1",
"prettier-plugin-svelte": "^2.2.0",
"release-it": "^14.5.1",
"svelte": "^3.35.0",
"svelte-i18n": "^3.3.7",
"svelte-preprocess": "^4.6.9",
@ -26,5 +28,23 @@
},
"dependencies": {
"validator": "^13.5.2"
},
"release-it": {
"git": {
"commit": true,
"requireCleanWorkingDir": false,
"commitMessage": "🚀Bumped version to ${version}",
"requireBranch": "dev",
"push": false,
"tag": true,
"tagName": null,
"tagAnnotation": "${version}"
},
"npm": {
"publish": false
},
"hooks": {
"after:bump": "npx auto-changelog --commit-limit false -p -u --hide-credit && git add CHANGELOG.md && node order.js && git add src/locales"
}
}
}