bump version for dep issue

Merge pull request #1 from CorySanin/dependabot/npm_and_yarn/brace-expansion-2.0.2
Bump brace-expansion from 2.0.1 to 2.0.2
2025-07-08 13:06:41 -05:00 · 2025-07-08 13:04:33 -05:00 · 2025-07-08 13:03:32 -05:00 · 2025-06-12 12:38:11 +00:00 · 2025-05-07 02:00:09 -05:00 · 2025-03-25 00:15:13 -05:00
11 changed files with 827 additions and 72 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -100,4 +100,6 @@ public
 distribution/*.mts
 distribution/*.mjs
 jobs/*
-!jobs/example.json5
+!jobs/example.json5
+!jobs/*-add.json*
+!jobs/*-move.json*
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,16 +5,30 @@
    "version": "0.2.0",
    "configurations": [
        {
-            "type": "pwa-node",
+            "type": "node",
            "request": "launch",
            "name": "Launch Program",
            "skipFiles": [
                "<node_internals>/**"
            ],
            "env": {
-                "JOB": "jobs/example.json5"
+                "GPGPASS": "${input:gpgpass}"
            },
-            "program": "${workspaceFolder}/index.js"
+            "program": "${workspaceFolder}/bin/artix-metro.mjs",
+            "args": [
+                "--job",
+                "jobs/kde-01.json5"
+            ],
+            "outFiles": [
+                "${workspaceFolder}/distribution/*"
+            ]
        }
-    ]
+    ],
+    "inputs": [
+    {
+      "id": "gpgpass",
+      "type": "promptString",
+      "description": "Enter your GPG password"
+    }
+  ]
 }
--- a/completion/bash
+++ b/completion/bash
@@ -3,7 +3,6 @@
 LIBDIR=${LIBDIR:-'/usr/share/artools/lib'}

 _artixpkg_pkgbase() {
-    source "${LIBDIR}"/pkg/git/config.sh
    source "${LIBDIR}"/pkg/util.sh
    ls -1 "${TREE_DIR_ARTIX}" | tr '\n' ' '
 }
@@ -57,6 +56,7 @@ _artix_metro_completion() {
            COMPREPLY=()
            ;;
        "-j"|"--job")
+            compopt -o filenames
            COMPREPLY=( $(compgen -f -- "$cur") )
            ;;
        "--workspace")
--- a/jobs/kde-add.json5
+++ b/jobs/kde-add.json5
@@ -0,0 +1,303 @@
+{
+    "repo": "gremlins",
+    "increment": false,
+    "packages": [
+        "grantleetheme5",
+        "grantleetheme",
+        "ktextaddons",
+        "kpimtextedit5",
+        "kpimtextedit",
+        "kidentitymanagement5",
+        "kidentitymanagement",
+        "libkleo",
+        "kmime5",
+        "kmime",
+        "kimap",
+        "kpkpass",
+        "kitinerary",
+        "kmbox",
+        "mimetreeparser",
+        "kleopatra",
+        "signon-kwallet-extension",
+        "kaccounts-integration",
+        "libakonadi5",
+        "akonadi",
+        "akonadi-mime",
+        "akonadi-search",
+        "akonadi-notes5",
+        "akonadi-notes",
+        "akonadi-contacts5",
+        "akonadi-contacts",
+        "ksmtp",
+        "libkgapi",
+        "kmailtransport",
+        "kldap",
+        "libkdepim",
+        "kcalutils",
+        "libktorrent",
+        "kpmcore",
+        "kopeninghours",
+        "kpublictransport",
+        "ktnef",
+        "kontactinterface5",
+        "kontactinterface",
+        "pimcommon",
+        "kosmindoormap",
+        "mailimporter",
+        "libgravatar",
+        "messagelib",
+        "akonadi-calendar",
+        "calendarsupport",
+        "kdiagram5",
+        "kdiagram",
+        "eventviews",
+        "kdepim-runtime",
+        "libksieve",
+        "mailcommon",
+        "incidenceeditor",
+        "mbox-importer",
+        "pim-data-exporter",
+        "akonadi-import-wizard",
+        "pim-sieve-editor",
+
+        "merkuro",
+        "akonadi-calendar-tools",
+        "korganizer",
+        "kaddressbook",
+        "kdepim-addons",
+        "kalarm",
+        "kmail-account-wizard",
+        "kmail",
+        "khealthcertificate",
+        "libquotient",
+        "itinerary",
+        "akonadiconsole",
+        "grantlee-editor",
+        "kontact",
+        "knotes",
+        "akregator",
+        
+        "libkexiv2",
+        "kdegraphics-mobipocket",
+        "kamera",
+        "kcolorchooser",
+        "libkdcraw",
+        "kimagemapeditor",
+        "ksanecore",
+        "libksane",
+        "kdegraphics-thumbnailers",
+        "kolourpaint",
+        "kruler",
+        "svgpart",
+        "okularpart5",
+        "okular",
+
+        "kmag",
+        "kmousetool",
+        "kontrast",
+        "kmouth",
+
+        "ark",
+        "filelight",
+        "kate",
+        "kbackup",
+        "kcalc",
+        "kcharselect",
+        "kdebugsettings",
+        "kdf",
+        "kdialog",
+        "keditbookmarks",
+        "kfind",
+        "markdownpart",
+        "sweeper",
+        "print-manager",
+        "kwalletmanager",
+        "ktimer",
+        "kgpg",
+        "kteatime",
+        "konsolepart5",
+        "konsole",
+        "skanpage",
+        "yakuake",
+
+        "baloo-widgets",
+        "kcron",
+        "khelpcenter",
+        "partitionmanager",
+        "kio5-extras",
+        "kio-extras",
+        "ksystemlog",
+        "kio-admin",
+        "arianna",
+
+        "dolphin",
+
+        "kio-zeroconf",
+        "krfb",
+        "krdc",
+        "kopete",
+        "pulseaudio-qt",
+        "kdeconnect",
+        "kdenetwork-filesharing",
+        "kget",
+        "ktorrent",
+        "konqueror",
+        "kaccounts-providers",
+        "telepathy-kde-common-internals",
+        "telepathy-kde-accounts-kcm",
+        "konversation",
+        "kio-gdrive",
+        "telepathy-kde-text-ui",
+        "telepathy-kde-send-file",
+        "telepathy-kde-integration-module",
+        "telepathy-kde-filetransfer-handler",
+        "telepathy-kde-approver",
+        "telepathy-kde-auth-handler",
+        "telepathy-kde-call-ui",
+        "telepathy-kde-desktop-applets",
+        "telepathy-kde-contact-runner",
+        "telepathy-kde-contact-list",
+
+        "artikulate",
+        "analitza",
+        "kalgebra",
+        "cantor",
+        "kdeedu-data",
+        "libkeduvocdocument",
+        "kanagram",
+        "kbruch",
+        "blinken",
+        "kgeography",
+        "khangman",
+        "kig",
+        "kiten",
+        "kalzium",
+        "marble",
+        "step",
+        "rocs",
+        "parley",
+        "minuet",
+        "klettres",
+        "kmplot",
+        "kqtquickcharts",
+        "kwordquiz",
+        "kturtle",
+        "ktouch",
+
+        "kwave",
+        "kmix",
+        "libkcompactdisc",
+        "libkcddb",
+        "audiocd-kio",
+        "k3b",
+        "kdenlive",
+        "kamoso",
+        "juk",
+        "dragon",
+        "elisa",
+        "ffmpegthumbs",
+
+        
+        "libkomparediff2",
+        "umbrello",
+        "poxml",
+        "lokalize",
+        "kompare",
+        "kirigami-gallery",
+        "kdesdk-thumbnailers",
+        "cervisia",
+        "dolphin-plugins",
+        "kapptemplate",
+        "kcachegrind",
+        "kde-dev-utils",
+        "kde-dev-scripts",
+
+        "libkdegames",
+        "libkmahjongg",
+        "bomber",
+        "bovo",
+        "granatier",
+        "kajongg",
+        "kapman",
+        "katomic",
+        "kblackbox",
+        "kblocks",
+        "kbounce",
+        "kbreakout",
+        "kdiamond",
+        "kfourinline",
+        "kgoldrunner",
+        "kigo",
+        "killbots",
+        "kiriki",
+        "kjumpingcube",
+        "klickety",
+        "klines",
+        "picmi",
+        "palapeli",
+        "lskat",
+        "kubrick",
+        "ktuberling",
+        "ksudoku",
+        "ksquares",
+        "kspaceduel",
+        "ksnakeduel",
+        "ksirk",
+        "kshisen",
+        "kmahjongg",
+        "kmines",
+        "knavalbattle",
+        "knetwalk",
+        "knights",
+        "kreversi",
+        "kpat",
+        "konquest",
+        "kolf",
+        "kollision",
+        "skladnik",
+
+        "kdevelop",
+        "kimageannotator",
+        "gwenview",
+        "kdevelop-php",
+        "kdevelop-python",
+        "skanlite",
+        "zanshin",
+        "falkon",
+        "colord-kde",
+
+        "alligator",
+        "angelfish",
+        "audiotube",
+        "kalk",
+        "kasts",
+        "kclock",
+        "kde-inotify-survey",
+        "kdesdk-kio",
+        "keysmith",
+        "kongress",
+        "krecorder",
+        "ktrip",
+        "kweathercore",
+        "kweather",
+        "kunifiedpush",
+        "neochat",
+        "isoimagewriter",
+        "plasmatube",
+        "telly-skout",
+        "tokodon",
+        "koko",
+        "libalkimia",
+        "kmymoney",
+        "accessibility-inspector",
+        "smb4k",
+        "digikam",
+        "audex",
+        "francis",
+        "kalm",
+        "kgraphviewer",
+        "massif-visualizer",
+        "calligra",
+        "qrca"
+    ]
+}
--- a/jobs/kde-move.json5
+++ b/jobs/kde-move.json5
@@ -0,0 +1,303 @@
+{
+    "source": "gremlins",
+    "repo": "stable",
+    "packages": [
+        "grantleetheme5",
+        "grantleetheme",
+        "ktextaddons",
+        "kpimtextedit5",
+        "kpimtextedit",
+        "kidentitymanagement5",
+        "kidentitymanagement",
+        "libkleo",
+        "kmime5",
+        "kmime",
+        "kimap",
+        "kpkpass",
+        "kitinerary",
+        "kmbox",
+        "mimetreeparser",
+        "kleopatra",
+        "signon-kwallet-extension",
+        "kaccounts-integration",
+        "libakonadi5",
+        "akonadi",
+        "akonadi-mime",
+        "akonadi-search",
+        "akonadi-notes5",
+        "akonadi-notes",
+        "akonadi-contacts5",
+        "akonadi-contacts",
+        "ksmtp",
+        "libkgapi",
+        "kmailtransport",
+        "kldap",
+        "libkdepim",
+        "kcalutils",
+        "libktorrent",
+        "kpmcore",
+        "kopeninghours",
+        "kpublictransport",
+        "ktnef",
+        "kontactinterface5",
+        "kontactinterface",
+        "pimcommon",
+        "kosmindoormap",
+        "mailimporter",
+        "libgravatar",
+        "messagelib",
+        "akonadi-calendar",
+        "calendarsupport",
+        "kdiagram5",
+        "kdiagram",
+        "eventviews",
+        "kdepim-runtime",
+        "libksieve",
+        "mailcommon",
+        "incidenceeditor",
+        "mbox-importer",
+        "pim-data-exporter",
+        "akonadi-import-wizard",
+        "pim-sieve-editor",
+
+        "merkuro",
+        "akonadi-calendar-tools",
+        "korganizer",
+        "kaddressbook",
+        "kdepim-addons",
+        "kalarm",
+        "kmail-account-wizard",
+        "kmail",
+        "khealthcertificate",
+        "libquotient",
+        "itinerary",
+        "akonadiconsole",
+        "grantlee-editor",
+        "kontact",
+        "knotes",
+        "akregator",
+        
+        "libkexiv2",
+        "kdegraphics-mobipocket",
+        "kamera",
+        "kcolorchooser",
+        "libkdcraw",
+        "kimagemapeditor",
+        "ksanecore",
+        "libksane",
+        "kdegraphics-thumbnailers",
+        "kolourpaint",
+        "kruler",
+        "svgpart",
+        "okularpart5",
+        "okular",
+
+        "kmag",
+        "kmousetool",
+        "kontrast",
+        "kmouth",
+
+        "ark",
+        "filelight",
+        "kate",
+        "kbackup",
+        "kcalc",
+        "kcharselect",
+        "kdebugsettings",
+        "kdf",
+        "kdialog",
+        "keditbookmarks",
+        "kfind",
+        "markdownpart",
+        "sweeper",
+        "print-manager",
+        "kwalletmanager",
+        "ktimer",
+        "kgpg",
+        "kteatime",
+        "konsolepart5",
+        "konsole",
+        "skanpage",
+        "yakuake",
+
+        "baloo-widgets",
+        "kcron",
+        "khelpcenter",
+        "partitionmanager",
+        "kio5-extras",
+        "kio-extras",
+        "ksystemlog",
+        "kio-admin",
+        "arianna",
+
+        "dolphin",
+
+        "kio-zeroconf",
+        "krfb",
+        "krdc",
+        "kopete",
+        "kdeconnect",
+        "kdenetwork-filesharing",
+        "kget",
+        "ktorrent",
+        "konqueror",
+        "kaccounts-providers",
+        "telepathy-kde-common-internals",
+        "telepathy-kde-accounts-kcm",
+        "konversation",
+        "kio-gdrive",
+        "telepathy-kde-text-ui",
+        "telepathy-kde-send-file",
+        "telepathy-kde-integration-module",
+        "telepathy-kde-filetransfer-handler",
+        "telepathy-kde-approver",
+        "telepathy-kde-auth-handler",
+        "telepathy-kde-call-ui",
+        "telepathy-kde-desktop-applets",
+        "telepathy-kde-contact-runner",
+        "telepathy-kde-contact-list",
+
+        "artikulate",
+        "analitza",
+        "kalgebra",
+        "cantor",
+        "kdeedu-data",
+        "libkeduvocdocument",
+        "kanagram",
+        "kbruch",
+        "blinken",
+        "kgeography",
+        "khangman",
+        "kig",
+        "kiten",
+        "kalzium",
+        "marble",
+        "step",
+        "rocs",
+        "parley",
+        "minuet",
+        "klettres",
+        "kmplot",
+        "kqtquickcharts",
+        "kwordquiz",
+        "kturtle",
+        "ktouch",
+
+        "kwave",
+        "kmix",
+        "libkcompactdisc",
+        "libkcddb",
+        "audiocd-kio",
+        "k3b",
+        "kdenlive",
+        "kamoso",
+        "juk",
+        "dragon",
+        "elisa",
+        "ffmpegthumbs",
+
+        
+        "libkomparediff2",
+        "umbrello",
+        "poxml",
+        "lokalize",
+        "kompare",
+        "kirigami-gallery",
+        "kdesdk-thumbnailers",
+        "cervisia",
+        "dolphin-plugins",
+        "kapptemplate",
+        "kcachegrind",
+        "kde-dev-utils",
+        "kde-dev-scripts",
+
+        "kdevelop",
+        "kimageannotator",
+        "gwenview",
+        "kdevelop-php",
+        "kdevelop-python",
+        "skanlite",
+        "zanshin",
+        "falkon",
+        "colord-kde",
+
+        "alligator",
+        "angelfish",
+        "audiotube",
+        "kalk",
+        "kasts",
+        "kclock",
+        "kde-inotify-survey",
+        "kdesdk-kio",
+        "keysmith",
+        "kongress",
+        "krecorder",
+        "ktrip",
+        "kweathercore",
+        "kweather",
+        "neochat",
+        "isoimagewriter",
+        "plasmatube",
+        "telly-skout",
+        "tokodon",
+        "koko",
+        "libalkimia",
+        "kmymoney",
+        "smb4k",
+        "digikam",
+
+        "libkdegames",
+        "libkmahjongg",
+        "bomber",
+        "bovo",
+        "granatier",
+        "kajongg",
+        "kapman",
+        "katomic",
+        "kblackbox",
+        "kblocks",
+        "kbounce",
+        "kbreakout",
+        "kdiamond",
+        "kfourinline",
+        "kgoldrunner",
+        "kigo",
+        "killbots",
+        "kiriki",
+        "kjumpingcube",
+        "klickety",
+        "klines",
+        "picmi",
+        "palapeli",
+        "lskat",
+        "kubrick",
+        "ktuberling",
+        "ksudoku",
+        "ksquares",
+        "kspaceduel",
+        "ksnakeduel",
+        "ksirk",
+        "kshisen",
+        "kmahjongg",
+        "kmines",
+        "knavalbattle",
+        "knetwalk",
+        "knights",
+        "kreversi",
+        "kpat",
+        "konquest",
+        "kolf",
+        "kollision",
+        "skladnik",
+        "pulseaudio-qt",
+        "audex",
+        "francis",
+        "kalm",
+        "accessibility-inspector",
+        "kgraphviewer",
+        "massif-visualizer",
+        "calligra",
+        "kunifiedpush",
+        "qrca"
+    ]
+}
--- a/jobs/kf6-add.json5
+++ b/jobs/kf6-add.json5
@@ -0,0 +1,77 @@
+{
+    "repo": "gremlins",
+    "packages": [
+        "extra-cmake-modules",
+        "breeze-icons",
+        "bluez-qt",
+        "attica",
+        "kapidox",
+        "karchive",
+        "kcalendarcore",
+        "kcodecs",
+        "kconfig",
+        "kcoreaddons",
+        "kcrash",
+        "kdbusaddons",
+        "kdnssd",
+        "kglobalaccel",
+        "kguiaddons",
+        "kholidays",
+        "ki18n",
+        "kfilemetadata",
+        "kdoctools",
+        "kcontacts",
+        "kcolorscheme",
+        "kidletime",
+        "kimageformats",
+        "kirigami",
+        "kitemmodels",
+        "kitemviews",
+        "knotifications",
+        "kpackage",
+        "kplotting",
+        "kpty",
+        "kdesu",
+        "kquickcharts",
+        "krunner",
+        "kservice",
+        "kded",
+        "ksvg",
+        "ktexttemplate",
+        "kunitconversion",
+        "kuserfeedback",
+        "kwidgetsaddons",
+        "kpeople",
+        "kjobwidgets",
+        "kdeclarative",
+        "kconfigwidgets",
+        "kiconthemes",
+        "kcompletion",
+        "kbookmarks",
+        "kwindowsystem",
+        "kwallet",
+        "kstatusnotifieritem",
+        "kauth",
+        "kxmlgui",
+        "modemmanager-qt",
+        "networkmanager-qt",
+        "prison",
+        "solid @patch",
+        "kio",
+        "kparts",
+        "knotifyconfig",
+        "kdav",
+        "kcmutils",
+        "purpose",
+        "baloo",
+        "sonnet",
+        "qqc2-desktop-style",
+        "ktextwidgets",
+        "syndication",
+        "knewstuff",
+        "frameworkintegration",
+        "syntax-highlighting",
+        "ktexteditor",
+        "threadweaver"
+    ]
+}
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,19 +1,19 @@
 {
  "name": "artix-metro",
-  "version": "3.1.0",
+  "version": "3.1.5",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "artix-metro",
-      "version": "3.1.0",
+      "version": "3.1.5",
      "license": "MIT",
      "dependencies": {
-        "artix-checkupdates": "1.0.1",
+        "artix-checkupdates": "1.0.2",
        "cli-color": "2.0.4",
-        "glob": "11.0.1",
+        "glob": "11.0.2",
        "json5": "2.2.3",
-        "ky": "1.7.4"
+        "ky": "1.8.1"
      },
      "bin": {
        "artix-metro": "bin/artix-metro.mjs"
@@ -21,8 +21,8 @@
      "devDependencies": {
        "@sindresorhus/tsconfig": "7.0.0",
        "@types/cli-color": "2.0.6",
-        "@types/node": "22.10.7",
-        "typescript": "5.7.3"
+        "@types/node": "22.15.14",
+        "typescript": "5.8.3"
      }
    },
    "node_modules/@isaacs/cliui": {
@@ -63,13 +63,13 @@
      "license": "MIT"
    },
    "node_modules/@types/node": {
-      "version": "22.10.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.7.tgz",
-      "integrity": "sha512-V09KvXxFiutGp6B7XkpaDXlNadZxrzajcY50EuoLIpQ6WWYCSvf19lVIazzfIzQvhUN2HjX12spLojTnhuKlGg==",
+      "version": "22.15.14",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.14.tgz",
+      "integrity": "sha512-BL1eyu/XWsFGTtDWOYULQEs4KR0qdtYfCxYAUYRoB7JP7h9ETYLgQTww6kH8Sj2C0pFGgrpM0XKv6/kbIzYJ1g==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "undici-types": "~6.20.0"
+        "undici-types": "~6.21.0"
      }
    },
    "node_modules/ansi-regex": {
@@ -97,9 +97,9 @@
      }
    },
    "node_modules/artix-checkupdates": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/artix-checkupdates/-/artix-checkupdates-1.0.1.tgz",
-      "integrity": "sha512-C0AxI3SfoUUekYg3ft/y4+tRjIe8uuDLvBQRSmkfNsRuBLNlEHaxhY/93JB6G4AGXp5RFLZYDnbgjakgbTLhkw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/artix-checkupdates/-/artix-checkupdates-1.0.2.tgz",
+      "integrity": "sha512-VTLeMVysGeZ3QiLtEyWoVM8D57YyeYhYQoL3vcW9b0dZE+zhE4di80PYEFGeQzIBcCStcBFnI1uSBoAEHMVHAQ==",
      "license": "MIT"
    },
    "node_modules/balanced-match": {
@@ -109,9 +109,9 @@
      "license": "MIT"
    },
    "node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
      "license": "MIT",
      "dependencies": {
        "balanced-match": "^1.0.0"
@@ -288,9 +288,9 @@
      }
    },
    "node_modules/glob": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.1.tgz",
-      "integrity": "sha512-zrQDm8XPnYEKawJScsnM0QzobJxlT/kHOOlRTio8IH/GrmxRE5fjllkzdaHclIuNjUQTJYH2xHNIGfdpJkDJUw==",
+      "version": "11.0.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.2.tgz",
+      "integrity": "sha512-YT7U7Vye+t5fZ/QMkBFrTJ7ZQxInIUjwyAjVj84CYXqgBdv30MFUPGnBR6sQaVq6Is15wYJUsnzTuWaGRBhBAQ==",
      "license": "ISC",
      "dependencies": {
        "foreground-child": "^3.1.0",
@@ -357,9 +357,9 @@
      }
    },
    "node_modules/ky": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/ky/-/ky-1.7.4.tgz",
-      "integrity": "sha512-zYEr/gh7uLW2l4su11bmQ2M9xLgQLjyvx58UyNM/6nuqyWFHPX5ktMjvpev3F8QWdjSsHUpnWew4PBCswBNuMQ==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/ky/-/ky-1.8.1.tgz",
+      "integrity": "sha512-7Bp3TpsE+L+TARSnnDpk3xg8Idi8RwSLdj6CMbNWoOARIrGrbuLGusV0dYwbZOm4bB3jHNxSw8Wk/ByDqJEnDw==",
      "license": "MIT",
      "engines": {
        "node": ">=18"
@@ -604,9 +604,9 @@
      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
    },
    "node_modules/typescript": {
-      "version": "5.7.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
-      "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
+      "version": "5.8.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
+      "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
      "dev": true,
      "license": "Apache-2.0",
      "bin": {
@@ -618,9 +618,9 @@
      }
    },
    "node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
      "dev": true,
      "license": "MIT"
    },
@@ -758,12 +758,12 @@
      "dev": true
    },
    "@types/node": {
-      "version": "22.10.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.7.tgz",
-      "integrity": "sha512-V09KvXxFiutGp6B7XkpaDXlNadZxrzajcY50EuoLIpQ6WWYCSvf19lVIazzfIzQvhUN2HjX12spLojTnhuKlGg==",
+      "version": "22.15.14",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.14.tgz",
+      "integrity": "sha512-BL1eyu/XWsFGTtDWOYULQEs4KR0qdtYfCxYAUYRoB7JP7h9ETYLgQTww6kH8Sj2C0pFGgrpM0XKv6/kbIzYJ1g==",
      "dev": true,
      "requires": {
-        "undici-types": "~6.20.0"
+        "undici-types": "~6.21.0"
      }
    },
    "ansi-regex": {
@@ -777,9 +777,9 @@
      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="
    },
    "artix-checkupdates": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/artix-checkupdates/-/artix-checkupdates-1.0.1.tgz",
-      "integrity": "sha512-C0AxI3SfoUUekYg3ft/y4+tRjIe8uuDLvBQRSmkfNsRuBLNlEHaxhY/93JB6G4AGXp5RFLZYDnbgjakgbTLhkw=="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/artix-checkupdates/-/artix-checkupdates-1.0.2.tgz",
+      "integrity": "sha512-VTLeMVysGeZ3QiLtEyWoVM8D57YyeYhYQoL3vcW9b0dZE+zhE4di80PYEFGeQzIBcCStcBFnI1uSBoAEHMVHAQ=="
    },
    "balanced-match": {
      "version": "1.0.2",
@@ -787,9 +787,9 @@
      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
    },
    "brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
      "requires": {
        "balanced-match": "^1.0.0"
      }
@@ -941,9 +941,9 @@
      }
    },
    "glob": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.1.tgz",
-      "integrity": "sha512-zrQDm8XPnYEKawJScsnM0QzobJxlT/kHOOlRTio8IH/GrmxRE5fjllkzdaHclIuNjUQTJYH2xHNIGfdpJkDJUw==",
+      "version": "11.0.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.2.tgz",
+      "integrity": "sha512-YT7U7Vye+t5fZ/QMkBFrTJ7ZQxInIUjwyAjVj84CYXqgBdv30MFUPGnBR6sQaVq6Is15wYJUsnzTuWaGRBhBAQ==",
      "requires": {
        "foreground-child": "^3.1.0",
        "jackspeak": "^4.0.1",
@@ -982,9 +982,9 @@
      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
    },
    "ky": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/ky/-/ky-1.7.4.tgz",
-      "integrity": "sha512-zYEr/gh7uLW2l4su11bmQ2M9xLgQLjyvx58UyNM/6nuqyWFHPX5ktMjvpev3F8QWdjSsHUpnWew4PBCswBNuMQ=="
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/ky/-/ky-1.8.1.tgz",
+      "integrity": "sha512-7Bp3TpsE+L+TARSnnDpk3xg8Idi8RwSLdj6CMbNWoOARIrGrbuLGusV0dYwbZOm4bB3jHNxSw8Wk/ByDqJEnDw=="
    },
    "lru-cache": {
      "version": "11.0.2",
@@ -1147,15 +1147,15 @@
      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
    },
    "typescript": {
-      "version": "5.7.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
-      "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
+      "version": "5.8.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
+      "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
      "dev": true
    },
    "undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
      "dev": true
    },
    "which": {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "artix-metro",
-  "version": "3.1.0",
+  "version": "3.1.5",
  "description": "Automate pushing packages to Artix",
  "keywords": [
    "artix",
@@ -31,16 +31,16 @@
  },
  "license": "MIT",
  "dependencies": {
-    "artix-checkupdates": "1.0.1",
+    "artix-checkupdates": "1.0.2",
    "cli-color": "2.0.4",
-    "ky": "1.7.4",
+    "ky": "1.8.1",
    "json5": "2.2.3",
-    "glob": "11.0.1"
+    "glob": "11.0.2"
  },
  "devDependencies": {
-    "typescript": "5.7.3",
+    "typescript": "5.8.3",
    "@sindresorhus/tsconfig": "7.0.0",
    "@types/cli-color": "2.0.6",
-    "@types/node": "22.10.7"
+    "@types/node": "22.15.14"
  }
 }
--- a/src/gitea.mts
+++ b/src/gitea.mts
@@ -1,7 +1,7 @@
 import ky from 'ky';
 import { snooze } from './snooze.mjs';

-type CiStatus = "pending" | "success" | "error" | "failure";
+type CiStatus = "pending" | "success" | "error" | "failure" | "";

 interface GiteaConfig {
    protocol?: string;
@@ -16,7 +16,12 @@ interface Commit {

 interface Status {
    sha: string;
-    state: CiStatus
+    state: CiStatus;
+}
+
+interface Hook {
+    active: boolean;
+    id: number;
 }

 class Gitea {
@@ -95,7 +100,43 @@ class Gitea {
        }
    }

+    async getHooks(...args: string[]): Promise<Hook[]> {
+        try {
+            let headers: HeadersInit = {};
+            if (this._token) {
+                headers['Authorization'] = `token ${this._token}`
+            }
+            const resp = await ky.get(`${this.getUrlPrefix()}/repos/${args.join('/')}/hooks`, {
+                headers
+            });
+            return await resp.json();
+        }
+        catch (err) {
+            throw err;
+        }
+    }
+
+    async sendTestWebhook(...args: string[]): Promise<void> {
+        try {
+            let headers: HeadersInit = {};
+            if (this._token) {
+                headers['Authorization'] = `token ${this._token}`
+            }
+            const hook = (await this.getHooks(...args)).find(hook => hook.active === true);
+            if (!hook) {
+                throw new Error('No active webhook found');
+            }
+            await ky.post(`${this.getUrlPrefix()}/repos/${args.join('/')}/hooks/${hook.id}/tests`, {
+                headers
+            });
+        }
+        catch (err) {
+            throw err;
+        }
+    }
+
    async waitForBuild(lastHash: string, ...args: string[]): Promise<void> {
+        let missingStatusCount = 0;
        while (true) {
            let status: Status | null;
            try {
@@ -108,7 +149,15 @@ class Gitea {
                await snooze(30000);
                continue;
            }
-            if (status.sha !== lastHash) {
+            if (!status.sha && !status.state) {
+                if (++missingStatusCount > 3) {
+                    console.log('No build info detected. Sending test webhook...');
+                    missingStatusCount = 0;
+                    await this.sendTestWebhook(...args);
+                }
+                await snooze(30000);
+            }
+            else if (status.sha !== lastHash) {
                if (status.state === 'success') {
                    break;
                }
--- a/src/pusher.mts
+++ b/src/pusher.mts
@@ -55,14 +55,21 @@ class Pusher {
    }

    async refreshGpg() {
-        if (await isPasswordRequired()) {
+        const sshSignMode = 'SSHKEYSIGN' in process.env;
+        if (sshSignMode || await isPasswordRequired()) {
            console.log(clc.cyan('Refreshing signature...'));
            this._createdSignfile ||= await runCommand('touch', [SIGNFILE]);
-            await runCommand('gpg', ['-a', '--passphrase', escapeCommandParam(this._config.gpgpass || ''), '--batch', '--pinentry-mode', 'loopback', '--detach-sign', SIGNFILE]);
-            await fsp.rm(`${SIGNFILE}.asc`);
+            if (sshSignMode) {
+                await runCommand('ssh-keygen', ['-Y', 'sign', '-f', path.resolve(process.env['SSHKEYSIGN'] as string), '-n', ' git', SIGNFILE]);
+            }
+            else {
+                await runCommand('gpg', ['-a', '--passphrase', escapeCommandParam(this._config.gpgpass || ''), '--batch', '--pinentry-mode', 'loopback', '--detach-sign', SIGNFILE]);
+            }
+            await fsp.rm(`${SIGNFILE}.${sshSignMode ? 'sig' : 'asc'}`)
        }
    }

+
    increment(pkg: string): Promise<void> {
        return new Promise(async (res, _) => {
            const pkgbuild = path.join(this._artools.workspace, 'artixlinux', pkg, 'PKGBUILD');
@@ -133,7 +140,7 @@ class Pusher {
        }

        console.log(clc.yellowBright('Running artix-checkupdates'));
-        const actionable = job.increment ? job.packages : (await (!!job.source ? checkupdates.fetchMovable() : checkupdates.fetchUpgradable())).map(res => res.basename);
+        const actionable = job.increment ? job.packages : (await (!!job.source ? checkupdates.fetchLooseMovable() : checkupdates.fetchUpgradable())).map(res => res.basename);

        // order is IMPORTANT. Must be BLOCKING.
        for (let i = 0; i < (job.packages || []).length; i++) {
--- a/testingpkg-kde.sh
+++ b/testingpkg-kde.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 read -s -p "Enter your GPG password: " GPGPASS
 export GPGPASS
-node index.js --job jobs/kde-01.json5 \
-&& node index.js --job jobs/kde-02-push.json
+artix-metro --job jobs/kde-add.json5 \
+&& artix-metro --job jobs/kde-move.json5

 ./notify.sh
 GPGPASS=""
Author	SHA1	Message	Date
Cory Sanin	9370098921	bump version for dep issue	2025-07-08 13:06:41 -05:00
Cory Sanin	a69b0c2071	Merge pull request #1 from CorySanin/dependabot/npm_and_yarn/brace-expansion-2.0.2 Bump brace-expansion from 2.0.1 to 2.0.2	2025-07-08 13:04:33 -05:00
Cory Sanin	de1e338cd3	Add jobs to version control	2025-07-08 13:03:32 -05:00
dependabot[bot]	744d1a6fe5	Bump brace-expansion from 2.0.1 to 2.0.2 Bumps [brace-expansion](https://github.com/juliangruber/brace-expansion) from 2.0.1 to 2.0.2. - [Release notes](https://github.com/juliangruber/brace-expansion/releases) - [Commits](https://github.com/juliangruber/brace-expansion/compare/v2.0.1...v2.0.2) --- updated-dependencies: - dependency-name: brace-expansion dependency-version: 2.0.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2025-06-12 12:38:11 +00:00
Cory Sanin	c0561a542f	3.1.4: update dependencies, fix bash completion	2025-05-07 02:00:09 -05:00
Cory Sanin	1d7e66459a	Simplify up ssh key signing logic	2025-03-25 00:15:13 -05:00
Cory Sanin	c1b59b8e20	Merge pull request 'Add ssh key sign' (#2 ) from ndowens/artix-metro:master into master Reviewed-on: #2	2025-03-25 05:57:23 +01:00
ndowens	fe95766606	Add ssh key sign	2025-03-25 04:55:56 +00:00
Cory Sanin	362593798c	use loose moves for verifing movable packages	2025-03-15 13:13:52 -05:00
Cory Sanin	362656d13e	retry failed webhooks	2025-02-08 23:21:42 -05:00