Merge pull request #18 from umati/upstream

fix: update dependencies and configure linter
barnstee · Sep 24, 2024 · 1fa449f · 1fa449f
2 parents 68a2ab1 + 130f904
commit 1fa449f
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 53 deletions.
diff --git a/.github/linters/.jscpd.json b/.github/linters/.jscpd.json
@@ -0,0 +1,6 @@
+{
+  "threshold": 12,
+  "reporters": ["consoleFull"],
+  "ignore": ["**/wwwroot/lib/**"],
+  "absolute": true
+}
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -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:
@@ -23,10 +23,8 @@ env:
   # github.repository as <account>/<repo>
   IMAGE_NAME: ${{ github.repository }}
 
-
 jobs:
   build:
-
     runs-on: ubuntu-latest
     permissions:
       contents: read

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -1,7 +1,7 @@
 ---
 name: Lint
 
-on:  # yamllint disable-line rule:truthy
+on: # yamllint disable-line rule:truthy
   push:
     branches: [main, develop]
   pull_request:
@@ -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 }}

diff --git a/TestEnvironment/docker-compose.yml b/TestEnvironment/docker-compose.yml
@@ -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
diff --git a/UA-CloudPublisher.csproj b/UA-CloudPublisher.csproj
@@ -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>