Skip to content

Commit 26497d3

Browse files
authored
Merge pull request #33 from riclolsen/master
Merge upstream
2 parents 32338b9 + 9e161f2 commit 26497d3

File tree

8 files changed

+30
-18
lines changed

8 files changed

+30
-18
lines changed

.idx/dev.nix

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
# see: https://developers.google.com/idx/guides/customize-idx-env
33
{ pkgs, ... }: {
44
# Which nixpkgs channel to use.
5-
channel = "stable-23.11"; # or "unstable"
5+
channel = "stable-24.11"; # or "unstable"
66

77
# Use https://search.nixos.org/packages to find packages
88
packages = [
99
pkgs.sudo
10-
pkgs.postgresql_15_jit
11-
pkgs.postgresql15Packages.timescaledb
12-
pkgs.postgresql15Packages.timescaledb_toolkit
10+
pkgs.postgresql_16_jit
11+
pkgs.postgresql16JitPackages.timescaledb
12+
#pkgs.postgresql16JitPackages.timescaledb_toolkit
13+
pkgs.postgresql16JitPackages.pgvector
1314
pkgs.util-linux.bin
1415
pkgs.dotnet-sdk_8
1516
pkgs.vscode-extensions.ms-dotnettools.csharp
@@ -32,7 +33,7 @@
3233
pkgs.mongodb
3334
pkgs.mongodb-tools
3435
pkgs.mongosh
35-
# pkgs.nodePackages.nodemon
36+
pkgs.nodePackages.nodemon
3637
];
3738

3839
#services.postgres = {

log/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# LOG folder
2+
3+
This folder contains the log files for the system.
4+

mongo_seed/b_create-db.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,19 +329,19 @@ var protocolConnectionsValidator = {
329329
sizeOfCOT: {
330330
bsonType: ['double', 'long', 'int', 'null'],
331331
minimum: 1,
332-
minimum: 2,
332+
maximum: 2,
333333
description: 'Size of cause of transmission field.',
334334
},
335335
sizeOfCA: {
336336
bsonType: ['double', 'long', 'int', 'null'],
337337
minimum: 1,
338-
minimum: 2,
338+
maximum: 2,
339339
description: 'Size of cause of common address field.',
340340
},
341341
sizeOfIOA: {
342342
bsonType: ['double', 'long', 'int', 'null'],
343343
minimum: 1,
344-
minimum: 3,
344+
maximum: 3,
345345
description: 'Size of cause of information object address field.',
346346
},
347347
k: {

platform-linux/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ npm install
136136
npm run build
137137

138138
export NODE_OPTIONS=--max-old-space-size=10000
139+
export ASTRO_TELEMETRY_DISABLED=1
139140

140141
cd ../../../custom-developments/basic_bargraph
141142
npm install

platform-mac/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ npm install
136136
npm run build
137137

138138
export NODE_OPTIONS=--max-old-space-size=10000
139+
export ASTRO_TELEMETRY_DISABLED=1
139140

140141
cd ../../../custom-developments/basic_bargraph
141142
npm install

platform-nix-idx/build.sh

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,21 +73,23 @@ go env -w GO111MODULE=auto
7373
export CGO_CPPFLAGS="-I /usr/include"
7474
export CGO_LDFLAGS="-L /usr/lib"
7575

76-
cd ../calculations
77-
go mod tidy
78-
go build
79-
cp calculations ../../bin/
76+
# avoid compiling go modules as Firebase Studio only currently provides 8GB RAM, not enough for the build
77+
78+
# you may need a lot of memory to build go drivers, the build may be killed by the system, if necessary add swap, e.g. 8GB RAM + 4GB Swap
79+
#cd ../calculations
80+
#go mod tidy
81+
#go build
82+
#cp calculations ../../bin/
8083

8184
#cd ../i104m
8285
#go mod tidy
8386
#go build
8487
#cp i104m ../../bin/
8588

86-
# you may need a lot of memory to build this step, the build may be killed by the system, if necessary add swap, e.g. 8GB RAM + 4GB Swap
87-
cd ../plc4x-client
88-
go mod tidy
89-
go build
90-
cp plc4x-client ../../bin/
89+
#cd ../plc4x-client
90+
#go mod tidy
91+
#go build
92+
#cp plc4x-client ../../bin/
9193

9294
# release some disk space
9395
rm -rf ~/.cache
@@ -146,6 +148,7 @@ rm -rf ~/json-scada/src/AdminUI/node_modules
146148
#npm run build
147149

148150
export NODE_OPTIONS=--max-old-space-size=10000
151+
export ASTRO_TELEMETRY_DISABLED=1
149152

150153
cd ../custom-developments/basic_bargraph
151154
npm install

platform-nix-idx/postgresql.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,8 @@ default_text_search_config = 'pg_catalog.english'
814814

815815

816816
dynamic_library_path = '/usr/lib'
817-
shared_preload_libraries = 'timescaledb,timescaledb_toolkit'
817+
#shared_preload_libraries = 'timescaledb,timescaledb_toolkit'
818+
shared_preload_libraries = 'timescaledb'
818819
unix_socket_directories = '/tmp'
819820

820821

platform-windows/buildupd.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ call %NPM% run build
197197
call %NPM% prune --omit=dev
198198

199199
set NODE_OPTIONS=--max-old-space-size=8000
200+
set ASTRO_TELEMETRY_DISABLED=1
200201

201202
cd %SRCPATH%\custom-developments\basic_bargraph
202203
call %NPM% i --package-lock-only

0 commit comments

Comments
 (0)