Skip to content

Commit 60b6c3a

Browse files
dragetddragetd
committed
Apply EditorConfig style rules and clean up some things
1 parent a69041e commit 60b6c3a

23 files changed

+479
-478
lines changed

‎.github/renovate.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
2-
"extends": ["config:base"],
2+
"extends": [
3+
"config:base"
4+
],
35
"rebaseWhen": "behind-base-branch",
4-
"ignoreDeps": ["golang.org/x/net", "golang.org/x/sys"]
6+
"ignoreDeps": [
7+
"golang.org/x/net",
8+
"golang.org/x/sys"
9+
]
510
}

‎.github/workflows/push.yml‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -14,38 +14,38 @@ jobs:
1414
GO111MODULE: "on"
1515

1616
steps:
17-
- name: Install Go
18-
uses: actions/setup-go@v1
19-
with:
20-
go-version: ${{ matrix.go-version }}
21-
- name: Install libgtk-3-dev
22-
if: matrix.platform == 'ubuntu-18.04'
23-
run: |
24-
sudo apt-get update -y
25-
sudo apt-get install -y libgtk-3-dev
26-
- name: Install goversioninfo
27-
shell: bash
28-
run: |
29-
export GOPATH="${HOME}/go"
30-
mkdir -p ${GOPATH}/bin
31-
mkdir -p ${GOPATH}/pkg
32-
mkdir -p ${GOPATH}/src
33-
go get github.com/josephspurrier/goversioninfo/cmd/goversioninfo@63e6d1acd3dd857ec6b8c54fbf52e10ce24a8786
34-
- name: Checkout repository
35-
uses: actions/checkout@v1
36-
- name: Test and build
37-
shell: bash
38-
run: |
39-
export GOPATH="${HOME}/go"
40-
export PATH="${GOPATH}/bin:${PATH}"
41-
make test
42-
make copy-test-files
43-
make
44-
make tools
45-
- name: Build and push Docker image
46-
shell: bash
47-
run: |
48-
printf "%s" "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USER }} --password-stdin
49-
docker build -f docker/validator-service.Dockerfile -t ${{ secrets.DOCKER_USER }}/trivrost-validator:${GITHUB_REF##*/} .
50-
docker push ${{ secrets.DOCKER_USER }}/trivrost-validator:${GITHUB_REF##*/}
51-
docker logout
17+
- name: Install Go
18+
uses: actions/setup-go@v1
19+
with:
20+
go-version: ${{ matrix.go-version }}
21+
- name: Install libgtk-3-dev
22+
if: matrix.platform == 'ubuntu-18.04'
23+
run: |
24+
sudo apt-get update -y
25+
sudo apt-get install -y libgtk-3-dev
26+
- name: Install goversioninfo
27+
shell: bash
28+
run: |
29+
export GOPATH="${HOME}/go"
30+
mkdir -p ${GOPATH}/bin
31+
mkdir -p ${GOPATH}/pkg
32+
mkdir -p ${GOPATH}/src
33+
go get github.com/josephspurrier/goversioninfo/cmd/goversioninfo@63e6d1acd3dd857ec6b8c54fbf52e10ce24a8786
34+
- name: Checkout repository
35+
uses: actions/checkout@v1
36+
- name: Test and build
37+
shell: bash
38+
run: |
39+
export GOPATH="${HOME}/go"
40+
export PATH="${GOPATH}/bin:${PATH}"
41+
make test
42+
make copy-test-files
43+
make
44+
make tools
45+
- name: Build and push Docker image
46+
shell: bash
47+
run: |
48+
printf "%s" "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USER }} --password-stdin
49+
docker build -f docker/validator-service.Dockerfile -t ${{ secrets.DOCKER_USER }}/trivrost-validator:${GITHUB_REF##*/} .
50+
docker push ${{ secrets.DOCKER_USER }}/trivrost-validator:${GITHUB_REF##*/}
51+
docker logout

‎.github/workflows/test.yml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,31 @@ jobs:
1515
GO111MODULE: "on"
1616

1717
steps:
18-
- name: Install Go
19-
uses: actions/setup-go@v1
20-
with:
21-
go-version: ${{ matrix.go-version }}
22-
- name: Install libgtk-3-dev
23-
if: matrix.platform == 'ubuntu-18.04'
24-
run: |
25-
sudo apt-get update -y
26-
sudo apt-get install -y libgtk-3-dev
27-
- name: Install goversioninfo
28-
shell: bash
29-
run: |
30-
export GOPATH="${HOME}/go"
31-
mkdir -p ${GOPATH}/bin
32-
mkdir -p ${GOPATH}/pkg
33-
mkdir -p ${GOPATH}/src
34-
go get github.com/josephspurrier/goversioninfo/cmd/goversioninfo@63e6d1acd3dd857ec6b8c54fbf52e10ce24a8786
35-
- name: Checkout repository
36-
uses: actions/checkout@v1
37-
- name: Test and build
38-
shell: bash
39-
run: |
40-
export GOPATH="${HOME}/go"
41-
export PATH="${GOPATH}/bin:${PATH}"
42-
make test
43-
make copy-test-files
44-
make
45-
make tools
18+
- name: Install Go
19+
uses: actions/setup-go@v1
20+
with:
21+
go-version: ${{ matrix.go-version }}
22+
- name: Install libgtk-3-dev
23+
if: matrix.platform == 'ubuntu-18.04'
24+
run: |
25+
sudo apt-get update -y
26+
sudo apt-get install -y libgtk-3-dev
27+
- name: Install goversioninfo
28+
shell: bash
29+
run: |
30+
export GOPATH="${HOME}/go"
31+
mkdir -p ${GOPATH}/bin
32+
mkdir -p ${GOPATH}/pkg
33+
mkdir -p ${GOPATH}/src
34+
go get github.com/josephspurrier/goversioninfo/cmd/goversioninfo@63e6d1acd3dd857ec6b8c54fbf52e10ce24a8786
35+
- name: Checkout repository
36+
uses: actions/checkout@v1
37+
- name: Test and build
38+
shell: bash
39+
run: |
40+
export GOPATH="${HOME}/go"
41+
export PATH="${GOPATH}/bin:${PATH}"
42+
make test
43+
make copy-test-files
44+
make
45+
make tools

‎CONTRIBUTING.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@ To create a release for the latest version:
4242
* Finish all pending changes to develop
4343
* Make sure CHANGES.md is complete and has the correct publication date and version number
4444
* Run these commands:
45-
```
46-
git checkout develop
47-
git pull
48-
# check with git log that the branch is in the state which you want to release
49-
git checkout master
50-
git pull
51-
git merge develop --ff-only
52-
git push
53-
# check if pipeline succeeds - should always be the case!
54-
```
45+
```
46+
git checkout develop
47+
git pull
48+
# check with git log that the branch is in the state which you want to release
49+
git checkout master
50+
git pull
51+
git merge develop --ff-only
52+
git push
53+
# check if pipeline succeeds - should always be the case!
54+
```
5555
Finally, make a release through [the release-overview of the project's GitHub page](https://github.com/setlog/trivrost/releases), creating a new tag against `master`. Tag should be `vX.Y.Z`, title should be `vX.Y.Z (YYYY-MM-DD)` and message should be the markdown-formatted list of fixes, features and changes from `CHANGES.md`.
5656
5757
Alternatively:

‎cmd/launcher/locking/signature_io.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"io/ioutil"
77
"os"
88

9-
log "github.com/sirupsen/logrus"
109
"github.com/setlog/trivrost/pkg/system"
10+
log "github.com/sirupsen/logrus"
1111
)
1212

1313
func readProcessSignatureListFile(filePath string) (procSigs []system.ProcessSignature) {

‎examples/deployment-config.json.complex.example‎

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,73 @@
11
{
2-
"Timestamp": "2019-02-07 14:53:17",
3-
"LauncherUpdate": [
4-
{
5-
"BundleInfoURL": "https://example.com/windows/launcher/bundleinfo.json",
6-
"TargetPlatforms": [ "linux" ]
7-
},
8-
{
9-
"BundleInfoURL": "https://example.com/mac/launcher/bundleinfo.json",
10-
"TargetPlatforms": [ "darwin" ]
11-
},
12-
{
13-
"BundleInfoURL": "https://example.com/linux/launcher/bundleinfo.json",
14-
"TargetPlatforms": [ "windows" ]
15-
}
16-
],
17-
"Bundles": [
18-
{
19-
"BundleInfoURL": "https://example.com/testapp/32-bit/bundleinfo.json",
20-
"LocalDirectory": "app",
21-
"TargetPlatforms": [ "386" ]
22-
},
23-
{
24-
"BundleInfoURL": "https://example.com/testapp/64-bit/bundleinfo.json",
25-
"LocalDirectory": "app",
26-
"TargetPlatforms": [ "amd64" ]
27-
},
28-
{
29-
"BundleInfoURL": "https://example.com/java/linux/bundleinfo.json",
30-
"LocalDirectory": "java",
31-
"TargetPlatforms": [ "linux" ]
32-
},
33-
{
34-
"BundleInfoURL": "https://example.com/java/mac/bundleinfo.json",
35-
"LocalDirectory": "java",
36-
"TargetPlatforms": [ "darwin" ]
2+
"Timestamp": "2019-02-07 14:53:17",
3+
"LauncherUpdate": [
4+
{
5+
"BundleInfoURL": "https://example.com/windows/launcher/bundleinfo.json",
6+
"TargetPlatforms": [ "linux" ]
7+
},
8+
{
9+
"BundleInfoURL": "https://example.com/mac/launcher/bundleinfo.json",
10+
"TargetPlatforms": [ "darwin" ]
11+
},
12+
{
13+
"BundleInfoURL": "https://example.com/linux/launcher/bundleinfo.json",
14+
"TargetPlatforms": [ "windows" ]
15+
}
16+
],
17+
"Bundles": [
18+
{
19+
"BundleInfoURL": "https://example.com/testapp/32-bit/bundleinfo.json",
20+
"LocalDirectory": "app",
21+
"TargetPlatforms": [ "386" ]
22+
},
23+
{
24+
"BundleInfoURL": "https://example.com/testapp/64-bit/bundleinfo.json",
25+
"LocalDirectory": "app",
26+
"TargetPlatforms": [ "amd64" ]
27+
},
28+
{
29+
"BundleInfoURL": "https://example.com/java/linux/bundleinfo.json",
30+
"LocalDirectory": "java",
31+
"TargetPlatforms": [ "linux" ]
32+
},
33+
{
34+
"BundleInfoURL": "https://example.com/java/mac/bundleinfo.json",
35+
"LocalDirectory": "java",
36+
"TargetPlatforms": [ "darwin" ]
37+
},
38+
{
39+
"BundleInfoURL": "https://example.com/java/windows/bundleinfo.json",
40+
"LocalDirectory": "java",
41+
"TargetPlatforms": [ "windows" ],
42+
"Tags": [ "msi" ]
43+
},
44+
{
45+
"BundleInfoURL": "https://example.com/testapp/resources-bundleinfo.json",
46+
"BaseURL": "https://media.example.com/testapp-pictures/",
47+
"LocalDirectory": "pictures"
48+
}
49+
],
50+
"Execution": {
51+
"Commands": [
52+
{
53+
"Name": "java\\bin\\javaw",
54+
"Arguments": [ "-Xm1024M", "-jar", "foo.jar" ],
55+
"Env": {
56+
"NEW_ENV": "New env variable.",
57+
"OMIT_ENV": null
3758
},
38-
{
39-
"BundleInfoURL": "https://example.com/java/windows/bundleinfo.json",
40-
"LocalDirectory": "java",
41-
"TargetPlatforms": [ "windows" ],
42-
"Tags": [ "msi" ]
59+
"TargetPlatforms": [ "windows-386" ]
60+
},
61+
{
62+
"Name": "java/bin/java",
63+
"Arguments": [ "-Xm1024M", "-jar", "foo.jar" ],
64+
"Env": {
65+
"NEW_ENV": "New env variable.",
66+
"OMIT_ENV": null
4367
},
44-
{
45-
"BundleInfoURL": "https://example.com/testapp/resources-bundleinfo.json",
46-
"BaseURL": "https://media.example.com/testapp-pictures/",
47-
"LocalDirectory": "pictures"
48-
}
68+
"TargetPlatforms": [ "linux", "darwin" ]
69+
}
4970
],
50-
"Execution": {
51-
"Commands": [
52-
{
53-
"Name": "java\\bin\\javaw",
54-
"Arguments": [ "-Xm1024M", "-jar", "foo.jar" ],
55-
"Env": {
56-
"NEW_ENV": "New env variable.",
57-
"OMIT_ENV": null
58-
},
59-
"TargetPlatforms": [ "windows-386" ]
60-
},
61-
{
62-
"Name": "java/bin/java",
63-
"Arguments": [ "-Xm1024M", "-jar", "foo.jar" ],
64-
"Env": {
65-
"NEW_ENV": "New env variable.",
66-
"OMIT_ENV": null
67-
},
68-
"TargetPlatforms": [ "linux", "darwin" ]
69-
}
70-
],
71-
"LingerTimeMilliseconds": 800
72-
}
71+
"LingerTimeMilliseconds": 800
72+
}
7373
}

‎examples/deployment-config.json.simple.example‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
{
2-
"Timestamp": "2019-02-07 14:53:17",
3-
"LauncherUpdate": [
4-
{
5-
"BundleInfoURL": "https://example.com/update/launcher/windows/bundleinfo.json"
6-
}
7-
],
8-
"Bundles": [
9-
{
10-
"BundleInfoURL": "https://example.com/update/java_testapp/bundleinfo.json",
11-
"LocalDirectory": "java_testapp"
12-
},
13-
{
14-
"BundleInfoURL": "https://java-update.example.com/windows/amd64/aoj-jdk-11.0.1/bundleinfo.json",
15-
"LocalDirectory": "java"
16-
}
17-
],
18-
"Execution": {
19-
"Commands": [
20-
{
21-
"Name": "java/bin/java",
22-
"Arguments": [ "-Xm1024M", "-jar", "foo.ar" ]
23-
}
24-
]
2+
"Timestamp": "2019-02-07 14:53:17",
3+
"LauncherUpdate": [
4+
{
5+
"BundleInfoURL": "https://example.com/update/launcher/windows/bundleinfo.json"
256
}
7+
],
8+
"Bundles": [
9+
{
10+
"BundleInfoURL": "https://example.com/update/java_testapp/bundleinfo.json",
11+
"LocalDirectory": "java_testapp"
12+
},
13+
{
14+
"BundleInfoURL": "https://java-update.example.com/windows/amd64/aoj-jdk-11.0.1/bundleinfo.json",
15+
"LocalDirectory": "java"
16+
}
17+
],
18+
"Execution": {
19+
"Commands": [
20+
{
21+
"Name": "java/bin/java",
22+
"Arguments": [ "-Xm1024M", "-jar", "foo.ar" ]
23+
}
24+
]
25+
}
2626
}

0 commit comments

Comments
 (0)