diff --git a/.github/workflows/release-gh-package.yml b/.github/workflows/release-gh-package.yml index d2c1c59..21883d9 100644 --- a/.github/workflows/release-gh-package.yml +++ b/.github/workflows/release-gh-package.yml @@ -13,12 +13,26 @@ jobs: - name: Checkout uses: actions/checkout@master + - name: Wine + run: | + sudo apt install wine64 + sudo dpkg --add-architecture i386 && sudo apt-get update && sudo apt-get install wine32 + - name: Install run: npm install - - name: Build + - name: Build OSX run: npm run pack-osx + - name: Build win + run: npm run exe + + - name: Pack + run: | + mv release/the-happy-app-darwin-x64 ./the-happy-app-mac + tar -czf the-happy-app-mac.tar.gz the-happy-app-mac + mv release/the-happy-app-windows-installer/The\ Happy\ App.exe . + - name: Setup Git id: setup run: | @@ -29,13 +43,10 @@ jobs: git tag $TAG_NAME git push origin $TAG_NAME - - name: Pack - run: | - mv release/the-happy-app-darwin-x64 ./the-happy-app-mac - tar -czf the-happy-app-mac.tar.gz the-happy-app-mac - - name: Release uses: softprops/action-gh-release@v1 with: - files: the-happy-app-mac.tar.gz + files: | + the-happy-app-mac.tar.gz + The\ Happy\ App.exe tag_name: ${{ steps.setup.outputs.TAG_NAME }} diff --git a/docs/Instructions_MAC.pdf b/docs/Instructions_MAC.pdf new file mode 100644 index 0000000..840e664 Binary files /dev/null and b/docs/Instructions_MAC.pdf differ diff --git a/docs/Instructions_WIN.pdf b/docs/Instructions_WIN.pdf new file mode 100644 index 0000000..4d98958 Binary files /dev/null and b/docs/Instructions_WIN.pdf differ diff --git a/installers/createMacInstaller.sh b/installers/createMacInstaller.sh index e55e96b..92fab8a 100644 --- a/installers/createMacInstaller.sh +++ b/installers/createMacInstaller.sh @@ -5,7 +5,7 @@ if [ ! -d release/the-happy-app-darwin-x64/The\ Happy\ App.app ]; then release/the-happy-app-darwin-x64/The\ Happy\ App.app fi -cp -f ../docs/Instructions_MAC.pdf \ +cp -f ./docs/Instructions_MAC.pdf \ release/the-happy-app-darwin-x64/INSTALL\ INSTRUCTIONS.pdf ./node_modules/.bin/electron-installer-dmg release/the-happy-app-darwin-x64/The\ Happy\ App.app the-happy-app --overwrite --icon=icons/Happy.icns --out=release/the-happy-app-mac-installer diff --git a/installers/createWindowsInstaller.js b/installers/createWindowsInstaller.js index bc873a1..fb238c3 100644 --- a/installers/createWindowsInstaller.js +++ b/installers/createWindowsInstaller.js @@ -14,7 +14,7 @@ function getInstallerConfig () { const outPath = path.join(rootPath, 'release') return Promise.resolve({ - appDirectory: path.join(outPath, 'the-happy-app-win32-ia32/'), + appDirectory: path.join(outPath, 'the-happy-app-win32-x64/'), authors: 'The Happy Team', noMsi: true, outputDirectory: path.join(outPath, 'the-happy-app-windows-installer'), diff --git a/package-lock.json b/package-lock.json index 46320b2..2771b4d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "The-Happy-App", + "name": "the-happy-app", "version": "0.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "The-Happy-App", + "name": "the-happy-app", "version": "0.1.0", "dependencies": { "face-api.js": "^0.22.2", diff --git a/package.json b/package.json index e630988..fe1f49c 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ "main": "main.js", "scripts": { "start": "DEBUG=true node_modules/.bin/electron .", - "pack-osx": "electron-packager . the-happy-app --overwrite --platform=darwin --arch=x64 --icon=icons/Happy.icns --prune=true --ignore=\"release|feelings|icons|.gitignore|.travis.yml\" --out=release", - "pack-win": "electron-packager . the-happy-app --overwrite --platform=win32 --arch=ia32 --icon=icons/Happy.ico --prune=true --ignore=\"release|feelings|icons|.gitignore|.travis.yml\" --out=release --version-string.CompanyName=CE --version-string.FileDescription=CE --version-string.ProductName=\"The Happy App\"", + "pack-osx": "electron-packager . the-happy-app --overwrite --platform=darwin --arch=x64 --icon=icons/Happy.icns --prune=true --ignore=\"release|feelings|icons|.gitignore|.github\" --out=release", + "pack-win": "electron-packager . the-happy-app --overwrite --asar --platform=win32 --arch=x64 --icon=icons/Happy.ico --prune=true --ignore=\"release|feelings|icons|.gitignore|.github\" --out=release --version-string.CompanyName=CE --version-string.FileDescription=CE --version-string.ProductName=\"The Happy App\"", "installer-osx": "bash installers/createMacInstaller.sh ", "installer-win": "node installers/createWindowsInstaller.js", "dmg": "npm run pack-osx; npm run installer-osx",