From 188ff6399ca881151258cf5b28a0492e75903b67 Mon Sep 17 00:00:00 2001 From: Jen Basch Date: Thu, 9 Jul 2026 16:34:31 -0700 Subject: [PATCH] Upgrade to Pkl 0.32, fix dependabot grouping/interval --- .github/PklProject | 3 +++ .github/PklProject.deps.json | 4 ++-- .github/dependabot.yml | 5 ++++- .github/index.pkl | 15 +++++++++------ .github/workflows/build.yml | 12 ++++++------ .github/workflows/main.yml | 12 ++++++------ .github/workflows/prb.yml | 12 ++++++------ 7 files changed, 36 insertions(+), 27 deletions(-) diff --git a/.github/PklProject b/.github/PklProject index 6bc1af7..372e1fd 100644 --- a/.github/PklProject +++ b/.github/PklProject @@ -23,4 +23,7 @@ dependencies { ["com.github.actions"] { uri = "package://pkg.pkl-lang.org/pkl-pantry/com.github.actions@1.3.0" } + ["com.github.dependabot"] { + uri = "package://pkg.pkl-lang.org/pkl-pantry/com.github.dependabot@1.1.0" + } } diff --git a/.github/PklProject.deps.json b/.github/PklProject.deps.json index c36008e..17b65e9 100644 --- a/.github/PklProject.deps.json +++ b/.github/PklProject.deps.json @@ -31,9 +31,9 @@ }, "package://pkg.pkl-lang.org/pkl-pantry/com.github.dependabot@1": { "type": "remote", - "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/com.github.dependabot@1.0.4", + "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/com.github.dependabot@1.1.0", "checksums": { - "sha256": "c7391119f946d7761d0ca0cc358ed8fe2bdfc691411087ccac89637bd96fec4a" + "sha256": "a797691aa08f2b4a4431bb0954e751643d81136ca25c58a647ae5153125efe28" } } } diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 95654f6..984d6d2 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,8 +8,11 @@ updates: directories: - /buildtimeeval - /simple + groups: + all: + group-by: dependency-name schedule: - interval: weekly + interval: quarterly - package-ecosystem: github-actions cooldown: default-days: 7 diff --git a/.github/index.pkl b/.github/index.pkl index ef18cc6..5868834 100644 --- a/.github/index.pkl +++ b/.github/index.pkl @@ -21,7 +21,7 @@ import "@pkl.impl.ghactions/jobs/HawkeyeCheck.pkl" import "@pkl.impl.ghactions/steps/SetupPkl.pkl" local swiftImage = "swift:6.2-rhel-ubi9" -local pklVersion = "0.31.0" +local pklVersion = "0.32.0" prb = main @@ -63,12 +63,12 @@ dependabot { updates { new { `package-ecosystem` = "swift" - directories { - "/buildtimeeval" - "/simple" - } + directories = + read*("../*/Package.swift").keys + .map((it) -> it.replaceFirst("..", "").replaceLast("/Package.swift", "")) + .toListing() schedule { - interval = "weekly" + interval = "quarterly" } cooldown { `default-days` = 7 @@ -76,6 +76,9 @@ dependabot { "https://github.com/apple/pkl-swift" } } + groups { + ["all"] { `group-by` = "dependency-name" } + } } } } diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eaa4936..1eba2cb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,9 +37,9 @@ jobs: - name: Setup Pkl id: setup-pkl env: - PKL_VERSION: 0.31.0 + PKL_VERSION: 0.32.0 PKL_FILENAME: pkl - PKL_DOWNLOAD_URL: https://github.com/apple/pkl/releases/download/0.31.0/pkl-linux-amd64 + PKL_DOWNLOAD_URL: https://github.com/apple/pkl/releases/download/0.32.0/pkl-linux-amd64 shell: bash run: |- DIR="$(mktemp -d /tmp/pkl-$PKL_VERSION-XXXXXX)" @@ -62,9 +62,9 @@ jobs: - name: Setup Pkl id: setup-pkl env: - PKL_VERSION: 0.31.0 + PKL_VERSION: 0.32.0 PKL_FILENAME: pkl - PKL_DOWNLOAD_URL: https://github.com/apple/pkl/releases/download/0.31.0/pkl-linux-amd64 + PKL_DOWNLOAD_URL: https://github.com/apple/pkl/releases/download/0.32.0/pkl-linux-amd64 shell: bash run: |- DIR="$(mktemp -d /tmp/pkl-$PKL_VERSION-XXXXXX)" @@ -86,9 +86,9 @@ jobs: - name: Setup Pkl id: setup-pkl env: - PKL_VERSION: 0.31.0 + PKL_VERSION: 0.32.0 PKL_FILENAME: pkl - PKL_DOWNLOAD_URL: https://github.com/apple/pkl/releases/download/0.31.0/pkl-linux-amd64 + PKL_DOWNLOAD_URL: https://github.com/apple/pkl/releases/download/0.32.0/pkl-linux-amd64 shell: bash run: |- DIR="$(mktemp -d /tmp/pkl-$PKL_VERSION-XXXXXX)" diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9d39b38..82f5f19 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,9 +35,9 @@ jobs: - name: Setup Pkl id: setup-pkl env: - PKL_VERSION: 0.31.0 + PKL_VERSION: 0.32.0 PKL_FILENAME: pkl - PKL_DOWNLOAD_URL: https://github.com/apple/pkl/releases/download/0.31.0/pkl-linux-amd64 + PKL_DOWNLOAD_URL: https://github.com/apple/pkl/releases/download/0.32.0/pkl-linux-amd64 shell: bash run: |- DIR="$(mktemp -d /tmp/pkl-$PKL_VERSION-XXXXXX)" @@ -60,9 +60,9 @@ jobs: - name: Setup Pkl id: setup-pkl env: - PKL_VERSION: 0.31.0 + PKL_VERSION: 0.32.0 PKL_FILENAME: pkl - PKL_DOWNLOAD_URL: https://github.com/apple/pkl/releases/download/0.31.0/pkl-linux-amd64 + PKL_DOWNLOAD_URL: https://github.com/apple/pkl/releases/download/0.32.0/pkl-linux-amd64 shell: bash run: |- DIR="$(mktemp -d /tmp/pkl-$PKL_VERSION-XXXXXX)" @@ -84,9 +84,9 @@ jobs: - name: Setup Pkl id: setup-pkl env: - PKL_VERSION: 0.31.0 + PKL_VERSION: 0.32.0 PKL_FILENAME: pkl - PKL_DOWNLOAD_URL: https://github.com/apple/pkl/releases/download/0.31.0/pkl-linux-amd64 + PKL_DOWNLOAD_URL: https://github.com/apple/pkl/releases/download/0.32.0/pkl-linux-amd64 shell: bash run: |- DIR="$(mktemp -d /tmp/pkl-$PKL_VERSION-XXXXXX)" diff --git a/.github/workflows/prb.yml b/.github/workflows/prb.yml index 5651417..9d3a1a4 100644 --- a/.github/workflows/prb.yml +++ b/.github/workflows/prb.yml @@ -31,9 +31,9 @@ jobs: - name: Setup Pkl id: setup-pkl env: - PKL_VERSION: 0.31.0 + PKL_VERSION: 0.32.0 PKL_FILENAME: pkl - PKL_DOWNLOAD_URL: https://github.com/apple/pkl/releases/download/0.31.0/pkl-linux-amd64 + PKL_DOWNLOAD_URL: https://github.com/apple/pkl/releases/download/0.32.0/pkl-linux-amd64 shell: bash run: |- DIR="$(mktemp -d /tmp/pkl-$PKL_VERSION-XXXXXX)" @@ -56,9 +56,9 @@ jobs: - name: Setup Pkl id: setup-pkl env: - PKL_VERSION: 0.31.0 + PKL_VERSION: 0.32.0 PKL_FILENAME: pkl - PKL_DOWNLOAD_URL: https://github.com/apple/pkl/releases/download/0.31.0/pkl-linux-amd64 + PKL_DOWNLOAD_URL: https://github.com/apple/pkl/releases/download/0.32.0/pkl-linux-amd64 shell: bash run: |- DIR="$(mktemp -d /tmp/pkl-$PKL_VERSION-XXXXXX)" @@ -80,9 +80,9 @@ jobs: - name: Setup Pkl id: setup-pkl env: - PKL_VERSION: 0.31.0 + PKL_VERSION: 0.32.0 PKL_FILENAME: pkl - PKL_DOWNLOAD_URL: https://github.com/apple/pkl/releases/download/0.31.0/pkl-linux-amd64 + PKL_DOWNLOAD_URL: https://github.com/apple/pkl/releases/download/0.32.0/pkl-linux-amd64 shell: bash run: |- DIR="$(mktemp -d /tmp/pkl-$PKL_VERSION-XXXXXX)"