Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewbenington committed Oct 20, 2024
2 parents f92996f + 59f852e commit 0585121
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ jobs:
cache: 'npm'
- name: install dependencies
run: npm install
- name: build
run: npm run build:no-mac
- name: publish
env:
gh_token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=0.4.1
VERSION=0.4.2
.PHONY: help
help: # Display this help.
@awk 'BEGIN {FS = ":.*#"; printf "\nUsage:\n make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?#/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^#@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"productName": "OpenHome",
"name": "openhome",
"version": "0.4.1",
"version": "0.4.2",
"description": "A tool for moving Pokémon between game saves",
"keywords": [
"pokemon",
Expand Down Expand Up @@ -37,7 +37,7 @@
"build:linux": "electron-vite build && electron-builder --linux --config",
"build:no-mac": "electron-vite build && electron-builder --linux --win --config",
"build:all": "electron-vite build && electron-builder --linux --mac --win --config",
"release": "electron-builder -wl",
"release": "electron-vite build && electron-builder -wl",
"compare": "ts-node src/types/pkm_old/__test__/all.test.ts"
},
"dependencies": {
Expand Down

0 comments on commit 0585121

Please sign in to comment.