Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update dependencies and configure linter #18

Merged
merged 4 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/linters/.jscpd.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"threshold": 12,
"reporters": ["consoleFull"],
"ignore": ["**/wwwroot/lib/**"],
"absolute": true
}
8 changes: 3 additions & 5 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ name: Docker
# separate terms of service, privacy policy, and support
# documentation.

on: # yamllint disable-line rule:truthy
on: # yamllint disable-line rule:truthy
schedule:
- cron: '23 9 * * *'
- cron: "23 9 * * *"
push:
branches: [main, develop]
# Publish semver tags as releases.
tags: ['v*.*.*']
tags: ["v*.*.*"]
pull_request:
branches: [main, develop]
merge_group:
Expand All @@ -23,10 +23,8 @@ env:
# github.repository as <account>/<repo>
IMAGE_NAME: ${{ github.repository }}


jobs:
build:

runs-on: ubuntu-latest
permissions:
contents: read
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Lint

on: # yamllint disable-line rule:truthy
on: # yamllint disable-line rule:truthy
push:
branches: [main, develop]
pull_request:
Expand Down Expand Up @@ -32,7 +32,7 @@ jobs:
fetch-depth: 0

- name: Super-linter
uses: super-linter/super-linter@v6.3.1
uses: super-linter/super-linter@v7.1.0
env:
# To report GitHub Actions status checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
86 changes: 43 additions & 43 deletions TestEnvironment/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
version: '3.8'
services:
ua-cloudpublisher:
image: ghcr.io/barnstee/ua-cloudpublisher:main
container_name: ua-cloud
ports:
- "80:80"
networks:
- sharedNetwork
opcplc:
image: mcr.microsoft.com/iotedge/opc-plc:latest
container_name: plc-sim
command:
[
"--pn=50000",
"--autoaccept",
"--sph",
"--sn=5",
"--sr=10",
"--st=uint",
"--fn=5",
"--fr=1",
"--ft=uint",
"--gn=5"
]
ports:
- "50000:50000"
networks:
- sharedNetwork
hivemq4:
image: hivemq/hivemq4
container_name: hivemq4
ports:
- "1883:1883"
networks:
- sharedNetwork
networks:
sharedNetwork:
driver: bridge
version: "3.8"

services:
ua-cloudpublisher:
image: ghcr.io/barnstee/ua-cloudpublisher:main
container_name: ua-cloud
ports:
- "80:80"
networks:
- sharedNetwork

opcplc:
image: mcr.microsoft.com/iotedge/opc-plc:latest
container_name: plc-sim
command:
[
"--pn=50000",
"--autoaccept",
"--sph",
"--sn=5",
"--sr=10",
"--st=uint",
"--fn=5",
"--fr=1",
"--ft=uint",
"--gn=5",
]
ports:
- "50000:50000"
networks:
- sharedNetwork

hivemq4:
image: hivemq/hivemq4
container_name: hivemq4
ports:
- "1883:1883"
networks:
- sharedNetwork

networks:
sharedNetwork:
driver: bridge
6 changes: 3 additions & 3 deletions UA-CloudPublisher.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
<PackageReference Include="Confluent.Kafka" Version="2.5.3" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
<PackageReference Include="MQTTnet" Version="4.3.7.1207" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client" Version="1.5.374.78" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client.ComplexTypes" Version="1.5.374.78" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Gds.Client.Common" Version="1.5.374.78" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client" Version="1.5.374.118" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client.ComplexTypes" Version="1.5.374.118" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Gds.Client.Common" Version="1.5.374.118" />
<PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
</ItemGroup>
Expand Down