Skip to content
This repository has been archived by the owner on Mar 18, 2024. It is now read-only.

Commit

Permalink
Add CI build and fix conflict
Browse files Browse the repository at this point in the history
Signed-off-by: Erik Jaegervall <[email protected]>
  • Loading branch information
erikbosch committed Feb 23, 2024
1 parent 941564f commit 60ab520
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 6 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/vissv2server-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@

name: vissv2server build check

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
paths:
- ".github/workflows/vissv2server-build.yml"
- "server/**"
workflow_dispatch:

concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: true

jobs:

vissv2server-test:
runs-on: ubuntu-latest

steps:
- name: Checkout repo
uses: actions/checkout@v4
- name: Build vissv2server
run: |
cd server/vissv2server
go build
- name: Verify that help succeeds
run: |
cd server/vissv2server
./vissv2server --help
14 changes: 9 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,20 @@ The server consist of the software components shown below:
- Access Grant token server
- Access Token server

hese used to be built as separate processes that communicated over the Websockets protocol.
These used to be built as separate processes that communicated over the Websockets protocol.
This model is available on the "multi-process" branch. To start them there is a shell script, please check the README for details of it.

On the master branch these coponents are today implemented as threads within a single process, to build it
On the master branch these components are today implemented as threads within a single process, to build it
move to the `./server/vissv2server` directory,

move to the ./server/vissv2 directory,
issue

issue $ go build

and the start it ./vissv2server
```bash
$ go build
```

and the start it `./vissv2server`

The server may be started with a few different command line flags, append --help to get more info about them.

Expand Down
2 changes: 1 addition & 1 deletion server/vissv2server/vissv2server.go
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@ func main() {
vssJson := parser.String("", "vssJson", &argparse.Options{Required: false, Help: "path and name vssPathlist json file", Default: "../vsspathlist.json"})
stateDB := parser.Selector("s", "statestorage", []string{"sqlite", "redis", "apache-iotdb", "none"}, &argparse.Options{Required: false,
Help: "Statestorage must be either sqlite, redis, apache-iotdb, or none", Default: "redis"})
historySupport := parser.Flag("s", "history", &argparse.Options{Required: false, Help: "Support for historic data requests", Default: false})
historySupport := parser.Flag("j", "history", &argparse.Options{Required: false, Help: "Support for historic data requests", Default: false})
dbFile := parser.String("", "dbfile", &argparse.Options{
Required: false,
Help: "statestorage database filename",
Expand Down

0 comments on commit 60ab520

Please sign in to comment.