Skip to content

Commit 1de5222

Browse files
authored
Merge branch 'main' into automated-moves-by-eol-mover-service
2 parents 4825f91 + 93143d5 commit 1de5222

File tree

90 files changed

+613
-299
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+613
-299
lines changed

aws-cli-2.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#nolint:documentation
33
package:
44
name: aws-cli-2
5-
version: "2.31.1"
5+
version: "2.31.2"
66
epoch: 0
77
description: "Universal Command Line Interface for Amazon Web Services (v2)"
88
copyright:
@@ -39,7 +39,7 @@ pipeline:
3939
- uses: git-checkout
4040
with:
4141
repository: https://github.com/aws/aws-cli
42-
expected-commit: b9b0cf1cd5446e5c4103af4f187de017fa2ef79f
42+
expected-commit: 83f1565b109f43b71d368f5423c136d03194f451
4343
tag: ${{package.version}}
4444

4545
- uses: patch

backfill-packages.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fmt-dev-10.2.1-r0.apk

bats.yaml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: bats
33
version: "1.12.0"
4-
epoch: 2
4+
epoch: 3
55
description: Bash Automated Testing System
66
copyright:
77
- license: MIT
@@ -29,10 +29,13 @@ pipeline:
2929
./install.sh "${{targets.contextdir}}/usr"
3030
mkdir -p "${{targets.contextdir}}/tmp/"
3131
cp -r ./docker "${{targets.contextdir}}/tmp/docker"
32+
# XXX This has to be exported this way, as ${{targets.contextdir}}
33+
# is not expanded in the environment variable declaration section.
34+
export BATS_LIBS_DEST_DIR="${{targets.contextdir}}/usr/lib/bats"
3235
"${{targets.contextdir}}/tmp/docker/install_libs.sh" support 0.3.0
3336
"${{targets.contextdir}}/tmp/docker/install_libs.sh" file 0.4.0
34-
"${{targets.contextdir}}/tmp/docker/install_libs.sh" assert 2.1.0
35-
"${{targets.contextdir}}/tmp/docker/install_libs.sh" detik 1.3.1
37+
"${{targets.contextdir}}/tmp/docker/install_libs.sh" assert 2.2.0
38+
"${{targets.contextdir}}/tmp/docker/install_libs.sh" detik 1.4.0
3639
find "${{targets.contextdir}}" -type f -perm /2000 -exec chmod g-s {} \;
3740
rm -rf "${{targets.contextdir}}/tmp/"
3841
@@ -95,6 +98,18 @@ test:
9598
cat << 'EOF' > /tmp/inline_test.bats
9699
#!/usr/bin/env bats
97100
101+
# ensure the included modules can be loaded
102+
bats_load_library bats-support
103+
bats_load_library bats-assert
104+
bats_load_library bats-file
105+
# bats-detik doesn't include a load.bats
106+
load "/usr/lib/bats/bats-detik/detik"
107+
108+
# test that the bats-assert (and bats-support) libs work
109+
@test 'assert_equal()' {
110+
assert_equal 'have' 'have'
111+
}
112+
98113
load_file() {
99114
source "/tmp/example.sh"
100115
}

bom.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package:
22
name: bom
3-
version: "0.7.0"
3+
version: "0.7.1"
44
epoch: 0 # CVE-2025-47910
55
description: A utility to generate SPDX-compliant Bill of Materials manifests
66
copyright:
@@ -18,7 +18,7 @@ pipeline:
1818
with:
1919
repository: https://github.com/kubernetes-sigs/bom
2020
tag: v${{package.version}}
21-
expected-commit: f93d90e22cd5e76eb9407fc3eb038ede6149025e
21+
expected-commit: 1ab6284ac5e118267414f2ac3874bb08a701e9ad
2222

2323
- uses: go/build
2424
with:

configurable-http-proxy.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: configurable-http-proxy
3-
version: "5.0.1"
4-
epoch: 1
3+
version: "5.1.0"
4+
epoch: 0
55
description: "HTTP parser written against llparse"
66
copyright:
77
- license: BSD-3-Clause
@@ -22,7 +22,7 @@ environment:
2222
pipeline:
2323
- uses: git-checkout
2424
with:
25-
expected-commit: d0256b228558a186e3608c00b4364fba9f25831a
25+
expected-commit: 8f989e5cc030248807e4ca6c1d1fbc0a6f59537f
2626
repository: https://github.com/jupyterhub/configurable-http-proxy
2727
tag: ${{package.version}}
2828

confluent-kafka.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package:
88
# with the `version:` field.
99
# 2. Created a new variable `mangled-package-version` to append `-ccs` to the
1010
# version.
11-
version: "8.2.0.273"
11+
version: "8.2.0.279"
1212
epoch: 0
1313
description: Community edition of Confluent Kafka.
1414
copyright:
@@ -46,7 +46,7 @@ var-transforms:
4646
pipeline:
4747
- uses: git-checkout
4848
with:
49-
expected-commit: dc4f23376c01db5577a43c74ec8777771d266478
49+
expected-commit: de757b0153794bde4392f02050854b363c57ea4d
5050
repository: https://github.com/confluentinc/kafka
5151
tag: v${{vars.mangled-package-version}}
5252

ddp-tool.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#nolint:valid-pipeline-git-checkout-commit,valid-pipeline-git-checkout-tag
22
package:
33
name: ddp-tool
4-
version: "1.0.34.0_git20250925"
4+
version: "1.0.34.0_git20250926"
55
epoch: 0
66
description: Intel Dynamic Device Personalization Tool
77
copyright:

dkron.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package:
22
name: dkron
3-
version: "4.0.7"
3+
version: "4.0.8"
44
epoch: 0 # GHSA-2464-8j7c-4cjm
55
description: Distributed job scheduler for microservices
66
copyright:
@@ -30,7 +30,7 @@ pipeline:
3030
with:
3131
repository: https://github.com/distribworks/dkron
3232
tag: v${{package.version}}
33-
expected-commit: fec67b958d9ecee749ddeda5b0f5c1e819872ab0
33+
expected-commit: a890c2f435a88b2f820cbc41c16a5407f82fd456
3434

3535
- name: Generate protobuf files
3636
runs: |

external-dns-0.16.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: external-dns-0.16
33
version: "0.16.1"
4-
epoch: 1 # GHSA-mh63-6h87-95cp
4+
epoch: 2 # GHSA-vvgc-356p-c3xw
55
description: Configure external DNS servers (AWS Route53, Google CloudDNS and others) for Kubernetes Ingresses and Services.
66
copyright:
77
- paths:
@@ -36,6 +36,7 @@ pipeline:
3636
with:
3737
deps: |-
3838
github.com/golang-jwt/jwt/[email protected]
39+
golang.org/x/[email protected]
3940
4041
- runs: |
4142
# Our global LDFLAGS conflict with a Makefile parameter

fluent-plugin-label-router.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#nolint:valid-pipeline-git-checkout-tag
22
package:
33
name: fluent-plugin-label-router
4-
version: "0.5.0_git20250925"
4+
version: "0.5.0_git20250926"
55
epoch: 0
66
description: Label-Router helps routing log messages based on their labels and namespace tag in a Kubernetes environment.
77
copyright:

0 commit comments

Comments
 (0)