From 715b34209e111630e1c26854365573362db902e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=B6ran=20Sander?= Date: Tue, 30 Jan 2024 08:48:49 +0000 Subject: [PATCH 1/2] Fix conditional release jobs in CI workflow --- .github/workflows/ci.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d099b9e3..1d5ffcb2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -101,7 +101,6 @@ jobs: - sp53 # timeout-minutes: 15 - # if: ${{ needs.release-please.outputs.releases_created }} if: needs.release-please.outputs.releases_created == 'true' env: DIST_FILE_NAME: butler @@ -224,7 +223,7 @@ jobs: - windows - sp53 # timeout-minutes: 15 - if: ${{ needs.release-please.outputs.releases_created }} + if: needs.release-please.outputs.releases_created == 'true' env: DIST_FILE_NAME: butler GITHUB_TOKEN: ${{ secrets.RELEASE_PLEASE_PAT }} @@ -328,7 +327,7 @@ jobs: runs-on: ubuntu-latest # timeout-minutes: 15 - if: ${{ needs.release-please.outputs.releases_created }} + if: needs.release-please.outputs.releases_created == 'true' env: DIST_FILE_NAME: butler GITHUB_TOKEN: ${{ secrets.RELEASE_PLEASE_PAT }} From 9767b569ac192f024d95be89111da941aace2120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=B6ran=20Sander?= Date: Tue, 30 Jan 2024 08:49:06 +0000 Subject: [PATCH 2/2] Update deps --- package-lock.json | 34 ++++++++++++++++++++++------------ package.json | 4 ++-- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5b3d5a2f..7c5c60e6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.1.3", "express-handlebars": "^7.0.7", - "fastify": "^4.25.2", + "fastify": "^4.26.0", "fastify-healthcheck": "^4.4.0", "fastify-plugin": "^4.5.0", "fs-extra": "^11.2.0", @@ -64,7 +64,7 @@ "winston": "^3.11.0", "winston-daily-rotate-file": "^4.7.1", "ws": "^8.16.0", - "xstate": "^5.5.2" + "xstate": "^5.6.0" }, "devDependencies": { "@babel/eslint-parser": "^7.23.9", @@ -4122,9 +4122,19 @@ "integrity": "sha512-cIusKBIt/R/oI6z/1nyfe2FvGKVTohVRfvkOhvx0nCEW+xf5NoCXjAHcWp93uOUBchzYcsvPlrapAdX1uW+YGg==" }, "node_modules/fastify": { - "version": "4.25.2", - "resolved": "https://registry.npmjs.org/fastify/-/fastify-4.25.2.tgz", - "integrity": "sha512-SywRouGleDHvRh054onj+lEZnbC1sBCLkR0UY3oyJwjD4BdZJUrxBqfkfCaqn74pVCwBaRHGuL3nEWeHbHzAfw==", + "version": "4.26.0", + "resolved": "https://registry.npmjs.org/fastify/-/fastify-4.26.0.tgz", + "integrity": "sha512-Fq/7ziWKc6pYLYLIlCRaqJqEVTIZ5tZYfcW/mDK2AQ9v/sqjGFpj0On0/7hU50kbPVjLO4de+larPA1WwPZSfw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fastify" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fastify" + } + ], "dependencies": { "@fastify/ajv-compiler": "^3.5.0", "@fastify/error": "^3.4.0", @@ -4133,7 +4143,7 @@ "avvio": "^8.2.1", "fast-content-type-parse": "^1.1.0", "fast-json-stringify": "^5.8.0", - "find-my-way": "^7.7.0", + "find-my-way": "^8.0.0", "light-my-request": "^5.11.0", "pino": "^8.17.0", "process-warning": "^3.0.0", @@ -4249,9 +4259,9 @@ } }, "node_modules/find-my-way": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/find-my-way/-/find-my-way-7.7.0.tgz", - "integrity": "sha512-+SrHpvQ52Q6W9f3wJoJBbAQULJuNEEQwBvlvYwACDhBTLOTMiQ0HYWh4+vC3OivGP2ENcTI1oKlFA2OepJNjhQ==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/find-my-way/-/find-my-way-8.1.0.tgz", + "integrity": "sha512-41QwjCGcVTODUmLLqTMeoHeiozbMXYMAE1CKFiDyi9zVZ2Vjh0yz3MF0WQZoIb+cmzP/XlbFjlF2NtJmvZHznA==", "dependencies": { "fast-deep-equal": "^3.1.3", "fast-querystring": "^1.0.0", @@ -8517,9 +8527,9 @@ } }, "node_modules/xstate": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/xstate/-/xstate-5.5.2.tgz", - "integrity": "sha512-RLf9wc5HDO0pvj2TQQ+lY6tDW8CU8Entfgmtzzo6NhkC8qOEBXSN6WUSvnUM7NHZgdih06+by1b4nbaHVu1c+g==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/xstate/-/xstate-5.6.0.tgz", + "integrity": "sha512-l62p4ZHM/fkGl68574s1dFzFmY8B3BeOff9EqBZbuonTSOXGx1fWTnh4SHSrS8Vhr5wyRT9afqWliMoO6Q+hUQ==", "funding": { "type": "opencollective", "url": "https://opencollective.com/xstate" diff --git a/package.json b/package.json index da332a8f..ab6b63e3 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.1.3", "express-handlebars": "^7.0.7", - "fastify": "^4.25.2", + "fastify": "^4.26.0", "fastify-healthcheck": "^4.4.0", "fastify-plugin": "^4.5.0", "fs-extra": "^11.2.0", @@ -104,7 +104,7 @@ "winston": "^3.11.0", "winston-daily-rotate-file": "^4.7.1", "ws": "^8.16.0", - "xstate": "^5.5.2" + "xstate": "^5.6.0" }, "devDependencies": { "@babel/eslint-parser": "^7.23.9",