kopia lustrzana https://gitlab.com/gridtracker.org/gridtracker
Merge branch 'master' into 'call-roster-refactor'
# Conflicts: # .gitignore # package.nw/lib/roster.jsmerge-requests/144/head
commit
fe20cdb695
|
@ -9,5 +9,3 @@ debian/*.substvars
|
|||
debian/tmp
|
||||
.DS_Store
|
||||
node_modules
|
||||
package-lock.json
|
||||
settings.json
|
|
@ -22,6 +22,11 @@ variables:
|
|||
# 3. committing to the default branch
|
||||
include:
|
||||
- template: "Workflows/MergeRequest-Pipelines.gitlab-ci.yml"
|
||||
- template: "Security/Dependency-Scanning.gitlab-ci.yml"
|
||||
- template: "Security/Secret-Detection.gitlab-ci.yml"
|
||||
- template: "Security/SAST.gitlab-ci.yml"
|
||||
|
||||
|
||||
|
||||
stages:
|
||||
- build
|
||||
|
|
|
@ -31,10 +31,18 @@ automatically, but if you want to run on the command line, you can (after runnin
|
|||
|
||||
# Developer Environment Setup
|
||||
|
||||
Our builds and development environment are usually managed by [nwjs-builder-phoenix](https://github.com/evshiron/nwjs-builder-phoenix), but it only supports Intel-based architectures.
|
||||
|
||||
## x86-based Windows, Mac, Linux
|
||||
|
||||
Run `npm install` and then `npm start`
|
||||
|
||||
## Apple Silicon Macs (M1, M1 Pro, M1 Max)
|
||||
|
||||
Phoenix does not support ARM-based macs, so we have to explicitly tell it to use Intel-based versions of NWJS.
|
||||
|
||||
Run `npm install` and then `npm start-x64`
|
||||
|
||||
## ARM-based Raspberry
|
||||
|
||||
Run `npm install`.
|
||||
|
|
Plik diff jest za duży
Load Diff
|
@ -16,6 +16,7 @@
|
|||
"dist-nix": "build --concurrent --tasks linux-x86,linux-x64,mac-x64 package.nw",
|
||||
"dist-win": "build --concurrent --tasks win-x86,win-x64 package.nw",
|
||||
"distsome": "build --debug --tasks linux-x64,mac-x64 package.nw",
|
||||
"start": "run package.nw"
|
||||
"start": "run package.nw",
|
||||
"start-x64": "run --x64 package.nw"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -11167,14 +11167,9 @@ function downloadAcknowledgements()
|
|||
"http",
|
||||
80
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
function checkForNewAcknowledgements()
|
||||
{
|
||||
downloadAcknowledgements();
|
||||
setTimeout(checkForNewAcknowledgements, 8640000);
|
||||
readAcksFromDisk();
|
||||
setTimeout(downloadAcknowledgements, 8640000);
|
||||
}
|
||||
}
|
||||
|
||||
function renderBandActivity()
|
||||
|
@ -12730,8 +12725,7 @@ function updateAcks(buffer)
|
|||
{
|
||||
try
|
||||
{
|
||||
g_acks = JSON.parse(buffer);
|
||||
fs.writeFileSync(g_NWappData + "acknowledgements.json", JSON.stringify(g_acks));
|
||||
g_acknowledgedCalls = JSON.parse(buffer);
|
||||
}
|
||||
catch (e)
|
||||
{
|
||||
|
|
Ładowanie…
Reference in New Issue