From 070bd495b65818db446660b094e5da46a480906c Mon Sep 17 00:00:00 2001 From: Dmitriy Pleshevskiy Date: Thu, 23 Mar 2023 12:07:38 +0300 Subject: [PATCH] packages/woodpecker: bump to latest master --- .../services/woodpecker/agent-docker.nix | 3 +- .../magenta/services/woodpecker/server.nix | 3 +- packages/woodpecker/common.nix | 6 +- packages/woodpecker/woodpecker-package.json | 62 +++++++++---------- 4 files changed, 38 insertions(+), 36 deletions(-) diff --git a/nixos/hosts/magenta/services/woodpecker/agent-docker.nix b/nixos/hosts/magenta/services/woodpecker/agent-docker.nix index b68c50e..ea4b65f 100644 --- a/nixos/hosts/magenta/services/woodpecker/agent-docker.nix +++ b/nixos/hosts/magenta/services/woodpecker/agent-docker.nix @@ -15,7 +15,8 @@ in systemd.services.woodpecker-agent = { enable = true; wantedBy = [ "multi-user.target" ]; - after = [ "woodpecker-server.service" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; restartIfChanged = true; serviceConfig = { EnvironmentFile = [ diff --git a/nixos/hosts/magenta/services/woodpecker/server.nix b/nixos/hosts/magenta/services/woodpecker/server.nix index dfde4fa..a9e78a2 100644 --- a/nixos/hosts/magenta/services/woodpecker/server.nix +++ b/nixos/hosts/magenta/services/woodpecker/server.nix @@ -14,7 +14,8 @@ in systemd.services.woodpecker-server = { wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "postgresql.service" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; serviceConfig = { # See: https://woodpecker-ci.org/docs/administration/server-config EnvironmentFile = [ diff --git a/packages/woodpecker/common.nix b/packages/woodpecker/common.nix index 3603781..804c633 100644 --- a/packages/woodpecker/common.nix +++ b/packages/woodpecker/common.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitea }: let - version = "13f878c10ac77d16ddae994b9253fa8c23c4d5be"; - srcSha256 = "sha256-ifyQK3eCThNPu3Qnfy6WUYba5qvop+6VJmwpWcpWJVE="; - yarnSha256 = "sha256-XsyMw2xqTjng4DoeiUb2+pJ9rGtHw2yZgy7pzLSDkas="; + version = "36bdad8b00d3b8329dd414f3ccd22675660ec1bb"; + srcSha256 = "sha256-c3fb/UP5flFuBvgLfxMAwSfQ24JlyjAiobBXeJhCvJk="; + yarnSha256 = "sha256-DZHwITEG+d3Xtj2k4FaWTEFNjJtX7rD0OvG2uuv6xH0="; in { inherit version yarnSha256; diff --git a/packages/woodpecker/woodpecker-package.json b/packages/woodpecker/woodpecker-package.json index 9d89a21..08210db 100644 --- a/packages/woodpecker/woodpecker-package.json +++ b/packages/woodpecker/woodpecker-package.json @@ -17,55 +17,55 @@ "test": "echo 'No tests configured' && exit 0" }, "dependencies": { - "@intlify/vite-plugin-vue-i18n": "^6.0.3", - "@kyvg/vue3-notification": "^2.4.1", - "@vueuse/core": "^9.3.1", + "@intlify/unplugin-vue-i18n": "^0.9.2", + "@kyvg/vue3-notification": "^2.9.0", + "@vueuse/core": "^9.13.0", "ansi_up": "^5.1.0", - "dayjs": "^1.11.5", + "dayjs": "^1.11.7", "floating-vue": "^2.0.0-beta.20", "fuse.js": "^6.6.2", - "humanize-duration": "^3.27.3", - "javascript-time-ago": "^2.5.7", + "humanize-duration": "^3.28.0", + "javascript-time-ago": "^2.5.9", "lodash": "^4.17.21", "node-emoji": "^1.11.0", - "pinia": "^2.0.23", + "pinia": "^2.0.33", "prismjs": "^1.29.0", - "vue": "^3.2.41", + "vue": "^3.2.47", "vue-i18n": "^9.2.2", - "vue-router": "^4.1.5" + "vue-router": "^4.1.6" }, "devDependencies": { - "@iconify/json": "^2.1.123", + "@iconify/json": "^2.2.36", "@types/humanize-duration": "^3.27.1", "@types/javascript-time-ago": "^2.0.3", - "@types/lodash": "^4.14.186", - "@types/node": "^18.11.2", + "@types/lodash": "^4.14.191", + "@types/node": "^18.15.3", "@types/node-emoji": "^1.8.2", "@types/prismjs": "^1.26.0", - "@typescript-eslint/eslint-plugin": "^5.40.1", - "@typescript-eslint/parser": "^5.40.1", - "@vitejs/plugin-vue": "^3.1.2", - "@vue/compiler-sfc": "^3.2.41", - "eslint": "^8.25.0", + "@typescript-eslint/eslint-plugin": "^5.55.0", + "@typescript-eslint/parser": "^5.55.0", + "@vitejs/plugin-vue": "^4.1.0", + "@vue/compiler-sfc": "^3.2.47", + "eslint": "^8.36.0", "eslint-config-airbnb-base": "^15.0.0", "eslint-config-airbnb-typescript": "^17.0.0", - "eslint-config-prettier": "^8.5.0", - "eslint-plugin-import": "^2.26.0", + "eslint-config-prettier": "^8.7.0", + "eslint-plugin-import": "^2.27.5", "eslint-plugin-prettier": "^4.2.1", - "eslint-plugin-promise": "^6.1.0", - "eslint-plugin-simple-import-sort": "^8.0.0", - "eslint-plugin-vue": "^9.6.0", - "eslint-plugin-vue-scoped-css": "^2.2.0", - "prettier": "^2.7.1", - "typescript": "4.8.3", - "unplugin-icons": "^0.14.12", - "unplugin-vue-components": "^0.22.8", - "vite": "^3.1.8", + "eslint-plugin-promise": "^6.1.1", + "eslint-plugin-simple-import-sort": "^10.0.0", + "eslint-plugin-vue": "^9.9.0", + "eslint-plugin-vue-scoped-css": "^2.4.0", + "prettier": "^2.8.5", + "typescript": "5.0.2", + "unplugin-icons": "^0.15.3", + "unplugin-vue-components": "^0.24.1", + "vite": "^4.2.0", "vite-plugin-prismjs": "^0.0.8", - "vite-plugin-windicss": "^1.8.8", - "vite-svg-loader": "^3.6.0", + "vite-plugin-windicss": "^1.8.10", + "vite-svg-loader": "^4.0.0", "vue-eslint-parser": "^9.1.0", - "vue-tsc": "^0.40.13", + "vue-tsc": "^1.2.0", "windicss": "^3.5.6" } }