From bec4dce67a762145061b222e618546d84302a06d Mon Sep 17 00:00:00 2001 From: Quentin Decaunes Date: Thu, 28 Feb 2019 13:52:24 +0100 Subject: [PATCH] Create pipeline. --- .gitlab-ci.yml | 48 +++++++++++++++++ README.md | 2 + installers/windows/createinstaller.js | 2 +- package-lock.json | 78 ++++++++++++--------------- package.json | 4 +- 5 files changed, 86 insertions(+), 48 deletions(-) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..3a48893 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,48 @@ +stages: + - install + - package + - installer + +node: + only: + - tags@le.storm1er/ryzen-controller + stage: install + tags: [ docker ] + image: electronuserland/builder:wine-mono + script: + - npm install + cache: + paths: + - node_modules/ + artifacts: + paths: + - node_modules/ + +win32: + only: + - tags@le.storm1er/ryzen-controller + stage: package + tags: [ docker ] + image: electronuserland/builder:wine-mono + script: + - npm run-script package + artifacts: + paths: + - release-builds/ + dependencies: + - node + +win32-installer: + only: + - tags@le.storm1er/ryzen-controller + stage: installer + tags: [ docker ] + image: electronuserland/builder:wine-mono + script: + - npm run-script build + artifacts: + paths: + - installer-builds/ + dependencies: + - node + - win32 diff --git a/README.md b/README.md index 6dc1b27..5ee97c8 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Ryzen controller +[![pipeline status](https://gitlab.com/le.storm1er/ryzen-controller/badges/master/pipeline.svg)](https://gitlab.com/le.storm1er/ryzen-controller/commits/master) + ## For users ### Pre-requisite diff --git a/installers/windows/createinstaller.js b/installers/windows/createinstaller.js index fbd04c5..3a025c7 100644 --- a/installers/windows/createinstaller.js +++ b/installers/windows/createinstaller.js @@ -13,7 +13,7 @@ function getInstallerConfig () { const rootPath = path.join('./') return Promise.resolve({ - appDirectory: path.join(rootPath, 'release-builds', 'RyzenController-win32-x64/'), + appDirectory: path.join(rootPath, 'release-builds', 'RyzenController-win32-ia32/'), authors: 'Decaunes Quentin', outputDirectory: path.join(rootPath, 'installer-builds'), setupExe: 'RyzenControllerInstaller.exe', diff --git a/package-lock.json b/package-lock.json index 381bc77..fe660a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,13 +1,13 @@ { - "name": "ryzen-controller", - "version": "1.1.0", + "name": "ryzencontroller", + "version": "1.2.0", "lockfileVersion": 1, "requires": true, "dependencies": { "@types/node": { - "version": "10.12.21", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.21.tgz", - "integrity": "sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ==", + "version": "10.12.27", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.27.tgz", + "integrity": "sha512-e9wgeY6gaY21on3ve0xAjgBVjGDWq/xUteK0ujsE53bUoxycMkqfnkUgMt6ffZtykZ5X12Mg3T7Pw4TRCObDKg==", "dev": true }, "abbrev": { @@ -17,9 +17,9 @@ "dev": true }, "ajv": { - "version": "6.8.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.8.1.tgz", - "integrity": "sha512-eqxCp82P+JfqL683wwsL73XmFs1eG6qjw+RD3YHx+Jll1r0jNd4dh8QG9NYAeNGA/hnZjeEDgtTskgJULbxpWQ==", + "version": "6.9.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz", + "integrity": "sha512-4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg==", "dev": true, "requires": { "fast-deep-equal": "^2.0.1", @@ -184,12 +184,6 @@ "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=", "dev": true }, - "builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", - "dev": true - }, "camelcase": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", @@ -392,9 +386,9 @@ } }, "electron": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/electron/-/electron-4.0.4.tgz", - "integrity": "sha512-zG5VtLrmPfmw1fXY/3BEtRZk7OZ7djQhweZ6rW+R5NeF6s8RTz/AwTGtLoBo4z8wmJ5QTy0Y941FZw4pe5YlpA==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/electron/-/electron-4.0.6.tgz", + "integrity": "sha512-r2ow/EmDibjoCNJp35mB1CcPs2xBF9fp2eoWuUOJmpVQyzdba6EnqsSD1BxwXzF9vQ5WkQ2UbfXBIvpomrdioQ==", "dev": true, "requires": { "@types/node": "^10.12.18", @@ -545,15 +539,15 @@ } }, "electron-winstaller": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/electron-winstaller/-/electron-winstaller-2.7.0.tgz", - "integrity": "sha512-WKRUTyGzTQbM2Q6dYm/iQqdYRQRTMiFakPxqOCJrH29YPVelGG9vNldal68fnq2yL+FFsoQi/3+qb6jDk143mw==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/electron-winstaller/-/electron-winstaller-2.5.2.tgz", + "integrity": "sha1-B7ijoFVrhtDfQE6kCqz7cbJg03M=", "dev": true, "requires": { "asar": "^0.11.0", "bluebird": "^3.3.4", "debug": "^2.2.0", - "fs-extra": "^2.1.2", + "fs-extra": "^0.26.7", "lodash.template": "^4.2.2", "temp": "^0.8.3" }, @@ -589,13 +583,16 @@ } }, "fs-extra": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz", - "integrity": "sha1-BGxwFjzvmq1GsOSn+kZ/si1x3jU=", + "version": "0.26.7", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz", + "integrity": "sha1-muH92UiXeY7at20JGM9C0MMYT6k=", "dev": true, "requires": { "graceful-fs": "^4.1.2", - "jsonfile": "^2.1.0" + "jsonfile": "^2.1.0", + "klaw": "^1.0.0", + "path-is-absolute": "^1.0.0", + "rimraf": "^2.2.8" } }, "glob": { @@ -971,15 +968,6 @@ "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", "dev": true }, - "is-builtin-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", - "dev": true, - "requires": { - "builtin-modules": "^1.0.0" - } - }, "is-finite": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", @@ -1173,18 +1161,18 @@ } }, "mime-db": { - "version": "1.37.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz", - "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==", + "version": "1.38.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz", + "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==", "dev": true }, "mime-types": { - "version": "2.1.21", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz", - "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==", + "version": "2.1.22", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz", + "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==", "dev": true, "requires": { - "mime-db": "~1.37.0" + "mime-db": "~1.38.0" } }, "minimatch": { @@ -1276,13 +1264,13 @@ } }, "normalize-package-data": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz", - "integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "dev": true, "requires": { "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", + "resolve": "^1.10.0", "semver": "2 || 3 || 4 || 5", "validate-npm-package-license": "^3.0.1" } diff --git a/package.json b/package.json index d8bb539..1128cd5 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "main": "main.js", "scripts": { "start": "electron .", - "package": "electron-packager . --overwrite --asar --platform=win32 --arch=x64 --prune=true --out=release-builds", + "package": "electron-packager . --overwrite --asar --platform=win32 --arch=ia32 --prune=true --out=release-builds", "build": "node installers/windows/createinstaller.js" }, "repository": "https://gitlab.com/le.storm1er/ryzen-controller", @@ -22,7 +22,7 @@ "devDependencies": { "electron": "^4.0.4", "electron-packager": "^13.1.0", - "electron-winstaller": "^2.7.0" + "electron-winstaller": "2.5.2" }, "dependencies": { "electron-settings": "^3.2.0",