Skip to content

Commit

Permalink
Bump version to feature
Browse files Browse the repository at this point in the history
  • Loading branch information
Waxo committed Nov 28, 2020
1 parent e5385fa commit 1eeb366
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 26 deletions.
37 changes: 16 additions & 21 deletions .github/workflows/github-publish.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages

name: Node.js Package
name: Package APP

on:
push:
Expand All @@ -10,31 +7,29 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 14
- name: Install ember
run: yarn global add ember-cli

- name: Install dependencies
run: yarn install --frozen-lockfile

- name: Install electron dependencies
run: cd electron-app && yarn install --frozen-lockfile && cd ..

- name: Build project
run: yarn run make-exe

- name: Create Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
uses: marvinpinto/action-automatic-releases@latest
with:
tag_name: ${{ github.ref }}
release_name: Release ${{ github.ref }}
draft: false
repo_token: ${{ secrets.GITHUB_TOKEN }}
prerelease: false
- name: Upload Release Asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: ./electron-app/out/make/squirrel.windows/x64/acc-results-json-to-csv-* Setup.exe
asset_name: acc-results-json-to-csv-* Setup.exe
asset_content_type: application/exe
files: |
./electron-app/out/make/squirrel.windows/x64/acc-results-json-to-csv-* Setup.exe
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 0.0.2
# 0.1.0 (2020-11-28)

- Updated car list
- Can support multiple files for multiple pre-qualification json merging
2 changes: 1 addition & 1 deletion app/components/toolbar-comp.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
View Results
{{/paper-button}}
<span class="flex"></span>
v0.0.2
v0.1.0
{{/toolbar.tools}}
{{/paper-toolbar}}

Expand Down
2 changes: 1 addition & 1 deletion electron-app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "acc-results-json-to-csv",
"productName": "acc-results-json-to-csv",
"version": "0.0.2",
"version": "0.1.0",
"description": "Import json with ACC bad formatting and export it to CSV",
"main": "src/index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion electron-app/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ app.on('ready', async () => {
Menu.setApplicationMenu(null);

// If you want to open up dev tools programmatically, call
mainWindow.openDevTools();
// mainWindow.openDevTools();

// Load the ember application
mainWindow.loadURL(emberAppURL);
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "acc-results-json-to-csv",
"version": "0.0.2",
"version": "0.1.0",
"private": true,
"description": "Import json with ACC bad formatting and export it to CSV",
"repository": "",
Expand Down

0 comments on commit 1eeb366

Please sign in to comment.