Skip to content

Commit

Permalink
Enable MacOS build
Browse files Browse the repository at this point in the history
Small corrections
Enable CI releases
  • Loading branch information
NAmorim committed Oct 12, 2021
1 parent fd51af9 commit e5af65a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ jobs:

strategy:
matrix:
os: [windows-latest]
os: [windows-latest, macos-latest]

steps:
- name: Check out Git repository
uses: actions/checkout@v1
uses: actions/checkout@v2

- name: Install Node.js, NPM and Yarn
uses: actions/setup-node@v1
with:
node-version: 16
node-version: 14

- name: Build/release Electron app
uses: samuelmeuli/action-electron-builder@v1
Expand Down
2 changes: 1 addition & 1 deletion Platform/Client/taskManagerServer.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
//console.log('[INFO] Client -> Task Manager Server -> runTask -> Task Name = ' + message.event.taskName)
//console.log('[INFO] Client -> Task Manager Server -> runTask -> Task Id = ' + message.event.taskId)

let path = './TaskServerRoot.js'
let path = global.env.BASE_PATH + '/TaskServerRoot.js'

/* Workarround to avoid having the same debug port at the forked process which makes it crash. */
for (let i = 0; i < process.execArgv.length; i++) {
Expand Down
8 changes: 4 additions & 4 deletions electron-wrapper.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const {app, Menu, BrowserWindow} = require('electron')
const path = require('path')
const fs = require('fs')
// To check for update on Github repo
const {autoUpdater} = require("electron-updater");
const {autoUpdater} = require("electron-updater")

// Enable non contribution mode (test)
process.env.SA_MODE = 'gitDisable'
Expand All @@ -23,11 +23,11 @@ run()

function run() {
if (process.env.PORTABLE_EXECUTABLE_DIR) {
process.env.PORTABLE_USER_DOCUMENTS = app.getPath("documents")
}
process.env.PORTABLE_USER_DOCUMENTS = app.getPath("userData")
}

const { fork } = require('child_process')
fork(path.join(__dirname, './PlatformRoot.js'), ["noBrowser"])
fork(path.join(__dirname, '/PlatformRoot.js'), ["noBrowser"])

server_ready = true
if (app_ready) open()
Expand Down

0 comments on commit e5af65a

Please sign in to comment.