Merge branch 'main' of github.com:jdrews/logstation into main

jdrews · May 1, 2023 · e22ef88 · e22ef88
2 parents 2ffcf31 + 40369cc
commit e22ef88
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 7 deletions.
diff --git a/.github/workflows/logstation-ci.yml → .github/workflows/build-test.yml b/.github/workflows/logstation-ci.yml → .github/workflows/build-test.yml
@@ -1,4 +1,4 @@
-name: Build and Test logstation
+name: Build/Test
 
 on:
   push:

diff --git a/README.md b/README.md
@@ -7,8 +7,8 @@ Binaries available in [releases](https://github.com/jdrews/logstation/releases).
 
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) 
 [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=jdrews_logstation&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=jdrews_logstation)
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=jdrews_logstation&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=jdrews_logstation) 
-
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=jdrews_logstation&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=jdrews_logstation)
+![Build/Test](https://github.com/jdrews/logstation/actions/workflows/build-test.yml/badge.svg)
 
 
 

diff --git a/web/package.json b/web/package.json
@@ -6,7 +6,7 @@
     "@emotion/react": "^11.10.6",
     "@emotion/styled": "^11.10.6",
     "@mui/material": "^5.12.0",
-    "@patternfly/react-core": "^4.276.8",
+    "@patternfly/react-core": "^4.276.9",
     "@patternfly/react-icons": "^4.93.6",
     "@patternfly/react-log-viewer": "^4.87.100",
     "react": "^17.0.1",
@@ -29,6 +29,6 @@
     "build": "yarn clean; yarn patch-patternfly; parcel build public/index.html",
     "clean": "rimraf dist",
     "//": "TODO: patch-patternfly is to fix an upstream problem tracked at: https://github.com/patternfly/patternfly/issues/4930",
-    "patch-patternfly": "shx sed -i 's/..\\/..\\/assets\\//\\/node_modules\\/@patternfly\\/react-styles\\/css\\/assets\\//g' node_modules/@patternfly/react-styles/css/components/BackgroundImage/background-image.css node_modules/@patternfly/react-styles/css/components/AboutModalBox/about-modal-box.css node_modules/@patternfly/react-styles/css/components/FormControl/form-control.css"
+    "patch-patternfly": "shx sed -i 's/..\\/..\\/assets\\//\\/node_modules\\/@patternfly\\/react-styles\\/css\\/assets\\//g' node_modules/@patternfly/react-styles/css/components/BackgroundImage/background-image.css node_modules/@patternfly/react-styles/css/components/AboutModalBox/about-modal-box.css node_modules/@patternfly/react-styles/css/components/FormControl/form-control.css node_modules/@patternfly/react-core/node_modules/@patternfly/react-styles/css/components/BackgroundImage/background-image.css node_modules/@patternfly/react-core/node_modules/@patternfly/react-styles/css/components/AboutModalBox/about-modal-box.css node_modules/@patternfly/react-core/node_modules/@patternfly/react-styles/css/components/FormControl/form-control.css node_modules/@patternfly/react-core/node_modules/@patternfly/react-styles/css/components/AboutModalBox/about-modal-box.css"
   }
 }
diff --git a/web/yarn.lock b/web/yarn.lock
@@ -1274,7 +1274,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@patternfly/react-core@npm:^4.273.1, @patternfly/react-core@npm:^4.276.8":
+"@patternfly/react-core@npm:^4.273.1":
   version: 4.276.8
   resolution: "@patternfly/react-core@npm:4.276.8"
   dependencies:
@@ -1292,6 +1292,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@patternfly/react-core@npm:^4.276.9":
+  version: 4.276.9
+  resolution: "@patternfly/react-core@npm:4.276.9"
+  dependencies:
+    "@patternfly/react-icons": ^4.93.6
+    "@patternfly/react-styles": ^4.92.7
+    "@patternfly/react-tokens": ^4.94.6
+    focus-trap: 6.9.2
+    react-dropzone: 9.0.0
+    tippy.js: 5.1.2
+    tslib: ^2.0.0
+  peerDependencies:
+    react: ^16.8 || ^17 || ^18
+    react-dom: ^16.8 || ^17 || ^18
+  checksum: 583c8d5285fb745196844549aa330a7f2fc8bd951c6f2374f584132a7030a23210ab29605fc02de0c7ae223344adb6705046ec53cf171fd178c2a8c5d01b78b5
+  languageName: node
+  linkType: hard
+
 "@patternfly/react-icons@npm:^4.93.4, @patternfly/react-icons@npm:^4.93.6":
   version: 4.93.6
   resolution: "@patternfly/react-icons@npm:4.93.6"
@@ -1326,6 +1344,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@patternfly/react-styles@npm:^4.92.7":
+  version: 4.92.7
+  resolution: "@patternfly/react-styles@npm:4.92.7"
+  checksum: 5ff91a424d818504a48a081450d2acd8bd4a285742f7ca6670de094c683125bbb746d25950613b07c3c0fefd345c2b3e022b8abd2ca01ccef0bc76f89413d75e
+  languageName: node
+  linkType: hard
+
 "@patternfly/react-tokens@npm:^4.94.6":
   version: 4.94.6
   resolution: "@patternfly/react-tokens@npm:4.94.6"
@@ -2632,7 +2657,7 @@ __metadata:
     "@mui/material": ^5.12.0
     "@parcel/packager-raw-url": ^2.8.3
     "@parcel/transformer-webmanifest": ^2.8.3
-    "@patternfly/react-core": ^4.276.8
+    "@patternfly/react-core": ^4.276.9
     "@patternfly/react-icons": ^4.93.6
     "@patternfly/react-log-viewer": ^4.87.100
     parcel: ^2.8.3