Browse Source

v1.1.1 hotfix

tags/v1.4.4
Ivan Bravo Bravo 1 year ago
parent
commit
450b3adb9f
4 changed files with 16 additions and 211 deletions
  1. 2
    5
      .github/workflows/ci.yml
  2. 0
    194
      src/package - Copy.json
  3. 1
    2
      src/package.json
  4. 13
    10
      src/scripts/release.js

+ 2
- 5
.github/workflows/ci.yml View File

@@ -19,7 +19,7 @@ on:

jobs:
build:
name: Build (${{ matrix.os-short }}
name: Build (${{ matrix.os-short }})
runs-on: ${{ matrix.os }}

# Strategy
@@ -46,6 +46,7 @@ jobs:

steps:
- name: Dump GitHub context
if: false
env:
GITHUB_CONTEXT: ${{ toJson(github) }}
run: echo "$GITHUB_CONTEXT"
@@ -70,10 +71,6 @@ jobs:
- name: Use Yarn
run: npm install -g yarn

- name: Use 7z
if: runner.os == 'macOS'
run: brew install p7zip

- name: Setup
working-directory: src
run: yarn install

+ 0
- 194
src/package - Copy.json View File

@@ -1,194 +0,0 @@
{
"name": "dreamtime",
"description": "Friendly user interface for DreamPower.",
"author": "DreamNet <dreamtime@dreamnet.tech>",
"homepage": "https://time.dreamnet.tech",
"version": "1.1.1",
"main": "electron/index.js",
"license": "GPL-3.0-only",
"private": true,
"repository": {
"type": "git",
"url": "git+https://github.com/dreamnettech/dreamtime.git"
},
"bugs": {
"url": "https://github.com/dreamnettech/dreamtime/issues"
},
"build": {
"appId": "com.dreamnet.dreamtime",
"productName": "DreamTime",
"directories": {
"output": "../dist"
},
"files": [
"!**/node_modules/*/{CHANGELOG.md,README.md,README,readme.md,readme}",
"!**/node_modules/*/{test,__tests__,tests,powered-test,example,examples}",
"!**/node_modules/*.d.ts",
"!**/node_modules/.bin",
"!**/*.{iml,o,hprof,orig,pyc,pyo,rbc,swp,csproj,sln,xproj,vscode,env.example,eslintrc.json,prettierrc,tgz}",
"!.editorconfig",
"!**/._*",
"!**/{.DS_Store,.git,.hg,.svn,CVS,RCS,SCCS,.gitignore,.gitattributes}",
"!**/{__pycache__,thumbs.db,.flowconfig,.idea,.vs,.nyc_output}",
"!**/{appveyor.yml,.travis.yml,circle.yml}",
"!**/{npm-debug.log,yarn.lock,.yarn-integrity,.yarn-metadata.json}",
"!**/{components,cli,layouts,middleware,mixins,pages,patches,plugins,scripts,store,third,nucleus.json,tailwind.config.js}",
"!{assets,modules}"
],
"win": {
"icon": "static/app.ico",
"target": [
{
"target": "nsis",
"arch": "x64"
}
],
"extraResources": [
{
"from": "node_modules/regedit/vbs",
"to": "vbs"
}
],
"extraFiles": [
{
"from": ".env",
"to": ".env"
}
]
},
"linux": {
"target": "deb",
"icon": "static/app.icns",
"executableName": "DreamTime",
"category": "Graphics",
"extraFiles": [
{
"from": ".env",
"to": ".env"
}
]
},
"mac": {
"target": "dmg",
"icon": "static/app.icns",
"category": "public.app-category.graphics-design",
"extraFiles": [
{
"from": ".env",
"to": "MacOS/.env"
}
]
},
"nsis": {
"oneClick": false,
"artifactName": "${productName}-v${version}-windows.${ext}",
"menuCategory": true,
"perMachine": false,
"allowToChangeInstallationDirectory": true,
"installerIcon": "static/app.ico",
"uninstallerIcon": "static/app.ico",
"license": "LICENSE"
},
"deb": {
"artifactName": "${productName}-v${version}-ubuntu.${ext}",
"fpm": [
"--deb-no-default-config-files"
]
},
"dmg": {
"title": "${productName} v${version}",
"artifactName": "${productName}-v${version}-macos.${ext}"
}
},
"scripts": {
"lint": "eslint --ext .js,.vue --ignore-path .gitignore .",
"postinstall": "patch-package",
"pack": "electron-builder --dir",
"dev:nuxt": "cross-env NODE_ENV=development nuxt",
"dev:electron": "cross-env NODE_ENV=development DEBUG=app:* electron .",
"build:nuxt": "cross-env NODE_ENV=production nuxt build",
"build:electron": "cross-env NODE_ENV=production electron-builder --publish=never",
"build": "yarn build:nuxt && yarn build:electron",
"preview": "yarn build:nuxt && yarn preview:electron",
"preview:electron": "cross-env NODE_ENV=production DEBUG=app:* DEVTOOLS=true electron ."
},
"husky": {
"hooks": {
"pre-commit": "yarn lint"
}
},
"dependencies": {
"7zip-bin": "^5.0.3",
"@nuxtjs/dotenv": "^1.4.0",
"@nuxtjs/pwa": "^2.6.0",
"better-queue": "^3.8.10",
"better-queue-memory": "^1.0.3",
"clipboard": "^2.0.4",
"compare-versions": "^3.5.0",
"cropperjs": "^1.5.2",
"debug": "^4.1.1",
"deferred": "^0.7.11",
"electron-context-menu": "^0.13.0",
"electron-nucleus": "^2.1.0",
"electron-utils": "^3.0.0",
"filesize": "^4.1.2",
"gpu-info": "^3.0.0",
"gsap": "^2.1.3",
"image-js": "^0.21.7",
"ipfs": "^0.39.0",
"js-event-bus": "^1.0.0",
"lodash": "^4.17.11",
"markdown": "^0.5.0",
"md5": "^2.2.1",
"mime-types": "^2.1.24",
"moment": "^2.24.0",
"node-7z": "^2.0.3",
"nuxt": "^2.0.0",
"patch-package": "^6.1.2",
"postinstall-postinstall": "^2.0.0",
"randomcolor": "^0.5.4",
"randomstring": "^1.1.5",
"raw-loader": "^3.0.0",
"regedit": "^3.0.3",
"supports-color": "^7.0.0",
"sweetalert": "^2.1.2",
"tippy.js": "^4.3.4",
"unzipper": "^0.10.2"
},
"devDependencies": {
"@babel/cli": "^7.5.0",
"@babel/core": "^7.5.0",
"@nuxtjs/eslint-config": "^0.0.1",
"@nuxtjs/eslint-module": "^0.0.1",
"@nuxtjs/tailwindcss": "^1.1.2",
"@octokit/rest": "^16.28.7",
"babel-eslint": "^10.0.1",
"cross-env": "^5.2.0",
"electron": "^5.0.6",
"electron-builder": "^20.44.4",
"electron-devtools-installer": "^2.2.4",
"electron-rebuild": "^1.8.5",
"eslint": "^5.15.1",
"eslint-config-airbnb-base": "^13.2.0",
"eslint-config-prettier": "^4.1.0",
"eslint-config-standard": ">=12.0.0",
"eslint-plugin-import": ">=2.16.0",
"eslint-plugin-jest": ">=22.3.0",
"eslint-plugin-lodash": "^5.1.0",
"eslint-plugin-node": ">=8.0.1",
"eslint-plugin-nuxt": ">=0.4.2",
"eslint-plugin-prettier": "^3.0.1",
"eslint-plugin-promise": ">=4.0.1",
"eslint-plugin-standard": ">=4.0.0",
"eslint-plugin-vue": "^5.2.3",
"husky": "^3.0.4",
"node-sass": "^4.12.0",
"nodemon": "^1.18.9",
"nuxtjs-electron": "^0.1.10",
"prettier": "^1.16.4",
"rollbar-sourcemap-webpack-plugin": "^2.5.1",
"sass-loader": "^8.0.0",
"tailwindcss": "^1.0.0",
"tailwindcss-alpha": "hacknug/tailwindcss-alpha#feature/tests"
}
}

+ 1
- 2
src/package.json View File

@@ -135,7 +135,6 @@
"gpu-info": "^0.0.1",
"gsap": "^3.0.1",
"image-js": "^0.21.8",
"ipfs": "^0.39.0",
"js-event-bus": "^1.0.0",
"lodash": "^4.17.15",
"markdown": "^0.5.0",
@@ -193,4 +192,4 @@
"tailwindcss": "^1.1.3",
"tailwindcss-alpha": "hacknug/tailwindcss-alpha#feature/tests"
}
}
}

+ 13
- 10
src/scripts/release.js View File

@@ -1,13 +1,13 @@
// DreamTime.
// Copyright (C) DreamNet. All rights reserved.
//
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License 3.0 as published by
// the Free Software Foundation.
//
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
//
//
// Written by Ivan Bravo Bravo <ivan@dreamnet.tech>, 2019.

const Octokit = require('@octokit/rest')
@@ -18,7 +18,7 @@ const path = require('path')
const pkg = require('../package.json')

const octokit = new Octokit({
auth: process.env.GITHUB_TOKEN
auth: process.env.GITHUB_TOKEN,
})

const isTagRelease = _.startsWith(process.env.GITHUB_REF, 'refs/tags')
@@ -40,7 +40,7 @@ async function getGithubReleaseUrl() {
response = await octokit.repos.getReleaseByTag({
owner: 'dreamnettech',
repo: 'dreamtime',
tag: tagName
tag: tagName,
})
} catch (err) {
if (err.status !== 404) {
@@ -56,11 +56,14 @@ async function getGithubReleaseUrl() {
tag_name: tagName,
name: version,
prerelease: true,
draft: false
draft: false,
})
} catch (err) {
console.log(err)
throw err
console.warn(err)
console.log('Retrying...')

// eslint-disable-next-line no-return-await
return await getGithubReleaseUrl()
}
}

@@ -75,10 +78,10 @@ async function uploadToGithub(filePath, fileName) {
url,
headers: {
'content-length': stats.size,
'content-type': mime.lookup(filePath)
'content-type': mime.lookup(filePath),
},
name: fileName,
file: fs.createReadStream(filePath)
file: fs.createReadStream(filePath),
})

return response

Loading…
Cancel
Save