diff --git a/.travis/custom_release.sh b/.travis/custom_release.sh index 5ade98520..297615c09 100644 --- a/.travis/custom_release.sh +++ b/.travis/custom_release.sh @@ -2,16 +2,26 @@ set -e set -x -if [[ "${TRAVIS_BRANCH}" = "master" ]]; then +if [ "${TRAVIS_BRANCH}" = "master" ] +then for env in ci qa do - echo - echo echo "PUSHING ${env}-beta" - rm -rf ./build/.git + rm -rf ./dist/.git .travis/release.sh "${env}-beta" done +elif [ "${TRAVIS_BRANCH}" = "master-stable" ] +then + for env in ci qa + do + echo "PUSHING ${env}-stable" + rm -rf ./dist/.git + .travis/release.sh "${env}-stable" + done + elif [[ "${TRAVIS_BRANCH}" = "prod-beta" || "${TRAVIS_BRANCH}" = "prod-stable" || "${TRAVIS_BRANCH}" = "qa-stable" || "${TRAVIS_BRANCH}" = "qa-beta" || "${TRAVIS_BRANCH}" = "ci-stable" ]]; then + echo "PUSHING ${TRAVIS_BRANCH}" + rm -rf ./build/.git .travis/release.sh "${TRAVIS_BRANCH}" fi diff --git a/package-lock.json b/package-lock.json index b72446f7d..4d6d2d1ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1612,9 +1612,9 @@ "integrity": "sha512-rLu3wcBWH4P5q1CGoSSH/i9hrXs7SlbRLkoq9IGuoPYNGQvDJ3pt/wmOM+XgYjIDRMVIdkUWt0RsfzF50JfnCw==" }, "@formatjs/ecma402-abstract": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.2.0.tgz", - "integrity": "sha512-jc1bZHhIE1YI0HnZIZcdlKpF4wle2pkgQpzXHDoyy4bUqzBSvDqktnF26hOkyA04KD4wqd61gkuTvRrHMmroAg==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.2.1.tgz", + "integrity": "sha512-LvbwgHxprafjceDfOC7yMl4sP5al71rAWahXk3qug5bV020aCq64WjqAo+zNnkIJk8hqK2pFKnNdDsT58HZJQw==" }, "@formatjs/intl-displaynames": { "version": "2.1.0", @@ -1654,20 +1654,20 @@ "integrity": "sha512-Q7+ksGpN6Dzp+W4qPai6OcUJ6pka2jPICJ0WlStFdy1RKGm90basrjSmox4xUR9DnMsWE5AfaiSu95nohCTLXw==" }, "@formatjs/ts-transformer": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/@formatjs/ts-transformer/-/ts-transformer-2.9.0.tgz", - "integrity": "sha512-H6skH+McG2OoUL3nc6Eas/5IunM8hk7uDU5Ak/qtNtvsehOH8g030LaFaMxw28BWq2vBipGAPlyyz/KTvO8fPw==", + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/@formatjs/ts-transformer/-/ts-transformer-2.9.1.tgz", + "integrity": "sha512-Ec7TZuDAw2apYeLxkUhJJ34D5TBW6xgPeuKhSUYQVHqA295+P1PJIsWJI+i/FD9Phj3Tz0XoQ6Dn5lXiyMfyDg==", "requires": { - "intl-messageformat-parser": "^6.0.5", + "intl-messageformat-parser": "^6.0.6", "typescript": "^4.0" }, "dependencies": { "intl-messageformat-parser": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-6.0.5.tgz", - "integrity": "sha512-4aO/RTUtzWiV/naqif4ubwz8P7THOxhraN6XmQpgXj4mdGjtPNO2j3vKlEDgAvv4BEi12R/JCHfLf7SUyfPKog==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-6.0.6.tgz", + "integrity": "sha512-XPAgYvCTSwgr92zzy5sfaglUu4uKjIWXHNTenEQRTo5t3o2TGxuPYPruxZqnvSLgnlAegiT/hBemmPcnFPNjAg==", "requires": { - "@formatjs/ecma402-abstract": "^1.2.0" + "@formatjs/ecma402-abstract": "^1.2.1" } } } @@ -2517,9 +2517,9 @@ } }, "@redhat-cloud-services/frontend-components": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components/-/frontend-components-2.4.3.tgz", - "integrity": "sha512-7ImxkXkQWt+Aa69I0O1bvZ9u2y+pJr6r6mTGdgrStsT63xUExJdBfFe37Dq71lRCYHtTGsae8Js2pzd4+LaHxw==", + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components/-/frontend-components-2.4.4.tgz", + "integrity": "sha512-MrPRi+H0rG2P1jeztxttkCytNoA6w2YizYe2z3blt6vy488afaWvF8lX5YaS9tyz4dxJ2T+uwvzoPujAsg3L2w==", "requires": { "@redhat-cloud-services/frontend-components-utilities": "*", "sanitize-html": "^1.25.0" @@ -2578,9 +2578,9 @@ } }, "@redhat-cloud-services/frontend-components-inventory-compliance": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components-inventory-compliance/-/frontend-components-inventory-compliance-2.2.1.tgz", - "integrity": "sha512-Sq28UXT7ClsjdIb/VfStViYkYqMD7wU3kjpwqA3KJhvATrVrEdQ2hjCrqlZxxm+Sa4Ihp8ABLtQrUxRbMn7oOw==", + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components-inventory-compliance/-/frontend-components-inventory-compliance-2.2.4.tgz", + "integrity": "sha512-YOUXnB+nSeW2UCjXs2NhmNW1IOCInBbsbq2L1E6PjhZ9CdjGtzseUPOVFsxGMD1/jxnhvr203oyftmaYZ0iVXg==", "requires": { "@apollo/react-hooks": "^3.1.5", "@redhat-cloud-services/frontend-components": "*", @@ -2629,9 +2629,9 @@ } }, "@redhat-cloud-services/frontend-components-inventory-patchman": { - "version": "0.22.1", - "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components-inventory-patchman/-/frontend-components-inventory-patchman-0.22.1.tgz", - "integrity": "sha512-N9/fOnvco010e6tqtPb0zkgoOtwKqFs5xyA1QPSX61uqqhvabjVvCSsSk2FIwhzsp96pyoYk/QUBf8mDJrfbLQ==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components-inventory-patchman/-/frontend-components-inventory-patchman-0.24.0.tgz", + "integrity": "sha512-1fwPLhuSABF8NUKnB+HjJORk1vHt4NeV7a+76GBaf8/vXHcRc+8G3/X46Sp/kfA1G0LaSv20V5a3SRgIc+OkGw==", "requires": { "@babel/plugin-proposal-class-properties": "^7.8.3", "@babel/runtime": "^7.8.7", @@ -2680,9 +2680,9 @@ } }, "@redhat-cloud-services/frontend-components-inventory-vulnerabilities": { - "version": "1.45.3", - "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components-inventory-vulnerabilities/-/frontend-components-inventory-vulnerabilities-1.45.3.tgz", - "integrity": "sha512-Eg2kdXUZiVgkpfFxBtCuI45KezQlgxcabKBuVI7+97ip26x34wtFbIzsZG/gmRXe24NSvEfAm08FHtyEtgrnxA==", + "version": "1.46.0", + "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components-inventory-vulnerabilities/-/frontend-components-inventory-vulnerabilities-1.46.0.tgz", + "integrity": "sha512-5P3WhzRV77/lm0w1lpe0uj7AqG2J9/6VJ0Aqu75nL2uxh4rwecUbS2nYnv1YYkgTxMJtv+O1522Omd1TLkqN1Q==", "requires": { "@babel/runtime": "^7.1.5", "@patternfly/react-core": "^4.18.13", @@ -2829,9 +2829,9 @@ } }, "@redhat-cloud-services/host-inventory-client": { - "version": "1.0.64", - "resolved": "https://registry.npmjs.org/@redhat-cloud-services/host-inventory-client/-/host-inventory-client-1.0.64.tgz", - "integrity": "sha512-S4iMpWyQltWk6jjifqIGtprG2r7ECJWC3KnwU8ofvEJFBIFTy8vSrZFg74MdujICc3iQxAfRS4XBg0SL1mKODQ==", + "version": "1.0.72", + "resolved": "https://registry.npmjs.org/@redhat-cloud-services/host-inventory-client/-/host-inventory-client-1.0.72.tgz", + "integrity": "sha512-AWjDrzlcjERGaBI5/8VUMdZwaBjRKO0RsO9byTpNCEOygGSeQNKv51Owas8VAhKH2pHOcm4v/C1uv2sB3VqKkg==", "requires": { "axios": "^0.19.2" } @@ -3399,9 +3399,9 @@ "integrity": "sha512-S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw==" }, "@types/zen-observable": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.0.tgz", - "integrity": "sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==" + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.1.tgz", + "integrity": "sha512-wmk0xQI6Yy7Fs/il4EpOcflG4uonUpYGqvZARESLc2oy4u69fkatFLbJOeW4Q6awO15P4rduAe6xkwHevpXcUQ==" }, "@webassemblyjs/ast": { "version": "1.9.0", @@ -4806,11 +4806,11 @@ } }, "@formatjs/intl-numberformat": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@formatjs/intl-numberformat/-/intl-numberformat-5.6.0.tgz", - "integrity": "sha512-MfYcqX1LE2N4P9eVtQXI/L6APlXgjexCj0b7GxJfK+icrwbA0XINSPGTt96kUxO5hf/tDu0MxJXnt9gwMKm/EA==", + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/@formatjs/intl-numberformat/-/intl-numberformat-5.6.1.tgz", + "integrity": "sha512-ENtX07hT/GJD/GZIvk1jf/nYHg8Hq3twZ4fOGAZIVhwd6ZqlAm6dgqqRxpNXw3ul8UCwx9tOeptF1gT42HwjKA==", "requires": { - "@formatjs/ecma402-abstract": "^1.2.0" + "@formatjs/ecma402-abstract": "^1.2.1" } }, "ajv": { @@ -23426,9 +23426,9 @@ } }, "victory": { - "version": "35.0.8", - "resolved": "https://registry.npmjs.org/victory/-/victory-35.0.8.tgz", - "integrity": "sha512-kx2lUxriyHFPJotov5AN1xIspF+l0+vB0IJeHxU1sVxJbLynWdcwn80Fpsexwnt5SYoO5o6bFTz/EbcMo3VWHA==", + "version": "35.0.9", + "resolved": "https://registry.npmjs.org/victory/-/victory-35.0.9.tgz", + "integrity": "sha512-9XnJojPffd1/MHN1SDLheZwnqMePPEnisTb0ZUVZqAb+QvI/kNrgiC7YzFaLt33ZU0cXdULK64fmB2CDuPMzsg==", "requires": { "victory-area": "^35.0.8", "victory-axis": "^35.0.8", diff --git a/package.json b/package.json index c09bb81b1..cb23b9591 100644 --- a/package.json +++ b/package.json @@ -6,16 +6,16 @@ "@patternfly/react-core": "^4.47.0", "@patternfly/react-icons": "^4.7.4", "@patternfly/react-table": "4.16.7", - "@redhat-cloud-services/frontend-components": "2.4.3", - "@redhat-cloud-services/frontend-components-inventory-compliance": "2.2.1", + "@redhat-cloud-services/frontend-components": "2.4.4", + "@redhat-cloud-services/frontend-components-inventory-compliance": "2.2.4", "@redhat-cloud-services/frontend-components-inventory-general-info": "2.2.1", "@redhat-cloud-services/frontend-components-inventory-insights": "2.6.3", - "@redhat-cloud-services/frontend-components-inventory-patchman": "0.22.1", - "@redhat-cloud-services/frontend-components-inventory-vulnerabilities": "^1.45.3", + "@redhat-cloud-services/frontend-components-inventory-patchman": "0.24.0", + "@redhat-cloud-services/frontend-components-inventory-vulnerabilities": "^1.46.0", "@redhat-cloud-services/frontend-components-notifications": "2.2.1", "@redhat-cloud-services/frontend-components-remediations": "^2.2.2", "@redhat-cloud-services/frontend-components-utilities": "2.2.1", - "@redhat-cloud-services/host-inventory-client": "1.0.64", + "@redhat-cloud-services/host-inventory-client": "1.0.72", "classnames": "^2.2.6", "graphql": "^15.0.0", "marked": "^1.1.0",