From 4111a2f0e878f94ac43013be45fb710300a009e9 Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 14 Oct 2021 20:49:48 +0200 Subject: [PATCH] docker image build/push is now handled by github actions --- bin/release.sh | 10 ---------- package-lock.json | 48 ++++++++++++++++++++++++----------------------- package.json | 4 ++-- 3 files changed, 27 insertions(+), 35 deletions(-) diff --git a/bin/release.sh b/bin/release.sh index f2ec729d7..cdaa324d2 100755 --- a/bin/release.sh +++ b/bin/release.sh @@ -69,13 +69,3 @@ gh release create "$TAG" \ "dist/$WINDOWS_X64_BUILD" \ "dist/$MAC_X64_BUILD" \ "dist/$SERVER_BUILD" - -echo "Building docker image" - -bin/build-docker.sh $VERSION - -echo "Pushing docker image to dockerhub" - -bin/push-docker-image.sh $VERSION - -echo "Release finished!" diff --git a/package-lock.json b/package-lock.json index e697b3cce..58c9bad98 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2188,11 +2188,6 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, - "colorette": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", - "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==" - }, "colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", @@ -4944,19 +4939,19 @@ } }, "jasmine": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.9.0.tgz", - "integrity": "sha512-JgtzteG7xnqZZ51fg7N2/wiQmXon09szkALcRMTgCMX4u/m17gVJFjObnvw5FXkZOWuweHPaPRVB6DI2uN0wVA==", + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.10.0.tgz", + "integrity": "sha512-2Y42VsC+3CQCTzTwJezOvji4qLORmKIE0kwowWC+934Krn6ZXNQYljiwK5st9V3PVx96BSiDYXSB60VVah3IlQ==", "dev": true, "requires": { "glob": "^7.1.6", - "jasmine-core": "~3.9.0" + "jasmine-core": "~3.10.0" } }, "jasmine-core": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.9.0.tgz", - "integrity": "sha512-Tv3kVbPCGVrjsnHBZ38NsPU3sDOtNa0XmbG2baiyJqdb5/SPpDO6GVwJYtUryl6KB4q1Ssckwg612ES9Z0dreQ==", + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.10.0.tgz", + "integrity": "sha512-XWGaJ25RUdOQnjGiLoQa9QG/R4u1e9Bk4uhLdn9F4JCBco84L4SKM52bxci4vWTSUzhmhuHNAkAHFN/6Cox9wQ==", "dev": true }, "jest-worker": { @@ -5782,9 +5777,9 @@ } }, "nanoid": { - "version": "3.1.25", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz", - "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==" + "version": "3.1.30", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", + "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==" }, "napi-build-utils": { "version": "1.0.2", @@ -6380,13 +6375,20 @@ } }, "postcss": { - "version": "8.3.6", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz", - "integrity": "sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==", + "version": "8.3.9", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.9.tgz", + "integrity": "sha512-f/ZFyAKh9Dnqytx5X62jgjhhzttjZS7hMsohcI7HEI5tjELX/HxCy3EFhsRxyzGvrzFF+82XPvCS8T9TFleVJw==", "requires": { - "colorette": "^1.2.2", - "nanoid": "^3.1.23", + "nanoid": "^3.1.28", + "picocolors": "^0.2.1", "source-map-js": "^0.6.2" + }, + "dependencies": { + "picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==" + } } }, "prebuild-install": { @@ -6862,9 +6864,9 @@ } }, "sanitize-html": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.5.1.tgz", - "integrity": "sha512-hUITPitQk+eFNLtr4dEkaaiAJndG2YE87IOpcfBSL1XdklWgwcNDJdr9Ppe8QKL/C3jFt1xH/Mbj20e0GZQOfg==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.5.2.tgz", + "integrity": "sha512-sJ1rO2YixFIqs2kIcEUb6PTrCjvz8DMq1XqWWuy0kjgjrn58GNLK1DKSIRybFZDO1WNgsEgD+WiEzTEYS8xEug==", "requires": { "deepmerge": "^4.2.2", "escape-string-regexp": "^4.0.0", diff --git a/package.json b/package.json index 1b2156d02..0f8416fb2 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "request": "^2.88.2", "rimraf": "3.0.2", "sanitize-filename": "1.6.3", - "sanitize-html": "2.5.1", + "sanitize-html": "2.5.2", "sax": "1.2.4", "semver": "7.3.5", "serve-favicon": "2.5.0", @@ -86,7 +86,7 @@ "electron-packager": "15.4.0", "electron-rebuild": "3.2.3", "esm": "3.2.25", - "jasmine": "3.9.0", + "jasmine": "3.10.0", "jsdoc": "3.6.7", "lorem-ipsum": "2.0.4", "rcedit": "3.0.1",