Skip to content

Commit

Permalink
Merge pull request #11 from gregoranders/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
gregoranders authored Apr 10, 2020
2 parents 08da8e5 + d4bc154 commit cbd1cfb
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ jobs:
tag: v${{ steps.projectinfo.outputs.version }}
name: ${{ steps.projectinfo.outputs.name }} - ${{ steps.projectinfo.outputs.version }} Release
target: ${{ github.ref }}
- name: npm run actions
run: |
npm run actions
- name: prepare release
id: prepare
uses: ./.github/actions/prepare-release
Expand Down
7 changes: 4 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"editor.renderWhitespace": "all",
"editor.wordWrapColumn": 120,
"editor.minimap.enabled": false,
"workbench.colorTheme": "Electron Highlighter",
"workbench.colorTheme": "Nord Deep",
"workbench.iconTheme": "material-icon-theme",
"terminal.integrated.copyOnSelection": true,
"jest.pathToJest": "npm test --",
Expand All @@ -14,5 +14,6 @@
"git.enableCommitSigning": true,
"git.fetchOnPull": true,
"jest.runAllTestsFirst": false,
"jest.enableInlineErrorMessages": true
}
"jest.enableInlineErrorMessages": true,
"editor.fontSize": 16
}
6 changes: 4 additions & 2 deletions .vscode/workspace.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
}
],
"settings": {
"workbench.colorTheme": "Nord",
"workbench.colorTheme": "Nord Deep",
"workbench.iconTheme": "material-icon-theme",
"terminal.integrated.copyOnSelection": true,
"jest.enableInlineErrorMessages": true,
Expand All @@ -20,7 +20,9 @@
"orta.vscode-jest",
"eg2.vscode-npm-script",
"pflannery.vscode-versionlens",
"visualstudioexptteam.vscodeintellicode"
"visualstudioexptteam.vscodeintellicode",
"pkief.material-icon-theme",
"marlosirapuan.nord-deep"
]
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "typescript-react-electron-starter",
"version": "0.0.5",
"version": "0.0.6",
"description": "TypeScript React Electron Starter",
"main": "app/main.js",
"scripts": {
Expand Down

0 comments on commit cbd1cfb

Please sign in to comment.