mirror/kopia
1
0
Fork 0
mirror of https://github.com/kopia/kopia.git synced 2026-01-27 07:48:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

switched back to using v-prefixed tag names.

Browse Source 
KOPIA_VERSION will now always be v-prefixed and we will strip the
prefix before embedding it in KopiaUI manifest.

Also upgraded Node and app NPM dependencies to latest versions.
This commit is contained in:
Jarek Kowalski
2020-07-25 16:55:28 -07:00
parent ff244b54ff
commit cfa30f2e45
5 changed files with 2086 additions and 2934 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Makefile
View File

@@ -7,7 +7,7 @@ node_modules: $(npm)
$(npm) $(npm_flags) install
electron_builder_flags:=
electron_builder_flags+=-c.extraMetadata.version=$(KOPIA_VERSION)
electron_builder_flags+=-c.extraMetadata.version=$(KOPIA_VERSION:v%=%)
electron_publish_flag:=never
ifeq ($(TRAVIS_PULL_REQUEST),false)

2
app/env.sh
View File

@@ -1 +1 @@
PATH=$(pwd)/../tools/.tools/nodejs/node/bin:$PATH
PATH=$(pwd)/../tools/.tools/node-12.18.3/node/bin:$PATH

4980
app/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

28
app/package.json
View File

@@ -5,17 +5,17 @@
"repository": "github:kopia/kopia",
"dependencies": {
"auto-launch": "^5.0.5",
"bootstrap": "^4.3.1",
"bootstrap": "^4.5.0",
"electron-first-run": "^3.0.0",
"electron-is-dev": "^1.1.0",
"electron-log": "^4.1.0",
"electron-updater": "^4.2.5",
"react": "^16.13.0",
"react-bootstrap": "^1.0.0-beta.17",
"react-dom": "^16.13.0",
"react-router-dom": "^5.1.2",
"react-scripts": "^3.4.0",
"uuid": "^7.0.2"
"electron-is-dev": "^1.2.0",
"electron-log": "^4.2.2",
"electron-updater": "^4.3.1",
"react": "^16.13.1",
"react-bootstrap": "^1.3.0",
"react-dom": "^16.13.1",
"react-router-dom": "^5.2.0",
"react-scripts": "^3.4.1",
"uuid": "^7.0.3"
},
"author": {
"email": "kopia-pmc@googlegroups.com",
@@ -27,7 +27,7 @@
"publish": [
{
"provider": "github",
"vPrefixedTagName": false
"vPrefixedTagName": true
}
],
"files": [
@@ -111,9 +111,9 @@
},
"devDependencies": {
"asar": "^2.1.0",
"concurrently": "^5.1.0",
"electron": "^7.1.14",
"electron-builder": "^22.4.1",
"concurrently": "^5.2.0",
"electron": "^7.3.2",
"electron-builder": "^22.7.0",
"electron-notarize": "^0.2.1"
},
"homepage": "./",

8
tools/tools.mk
View File

@@ -85,7 +85,7 @@ TOOLS_DIR:=$(SELF_DIR)$(slash).tools
# tool versions
GOLANGCI_LINT_VERSION=1.23.7
NODE_VERSION=12.16.1
NODE_VERSION=12.18.3
HUGO_VERSION=0.67.1
GORELEASER_VERSION=v0.128.0
@@ -200,16 +200,16 @@ ifeq ($(TRAVIS_PULL_REQUEST),false)
ifneq ($(TRAVIS_TAG),)
# travis, tagged release
KOPIA_VERSION:=$(TRAVIS_TAG:v%=%)
KOPIA_VERSION:=$(TRAVIS_TAG)
else
# travis, non-tagged release
KOPIA_VERSION:=$(commit_date_ymd).0.$(commit_time_of_day)
KOPIA_VERSION:=v$(commit_date_ymd).0.$(commit_time_of_day)
endif
else
# non-travis, or travis PR
KOPIA_VERSION:=$(date_ymd).0.0-$(shell git rev-parse --short HEAD)
KOPIA_VERSION:=v$(date_ymd).0.0-$(shell git rev-parse --short HEAD)
endif