Skip to content

Commit 4feffd6

Browse files
committed
Merge branch 'main' into llvm/llvm-20
2 parents 222102f + dfa2556 commit 4feffd6

File tree

178 files changed

+2528
-460
lines changed

Some content is hidden

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

178 files changed

+2528
-460
lines changed

.github/chainguard/ci-license-check.sts.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ subject_pattern: "(111508570611001124410)"
66

77
permissions:
88
checks: write
9+
pull_requests: write # need to comment on PRs

.github/chainguard/elastic-build.sts.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ issuer: https://accounts.google.com
88
# presubmit: 114870839879105817572: ebuild-zasv64d5x1oc4m3epw39yod@prod-enforce-fabc.iam.gserviceaccount.com
99
# postsubmit: 118124811908286464886: ebuild-ckhudf69he6dfl1xy83uuke@prod-enforce-fabc.iam.gserviceaccount.com
1010
# world: 100027593799559093519: ebuild-n0ppcbm8uzc6ew2wy4gesfg@prod-enforce-fabc.iam.gserviceaccount.com
11-
subject_pattern: "(116478844699827634314|115457633213442188328|118305965159726888964|114870839879105817572|118124811908286464886|100027593799559093519)"
11+
# eco-2-28:
12+
# presubmit: 109278469796396932019: ebuild-456o8jve9m82pzkyd0rxyya@prod-enforce-fabc.iam.gserviceaccount.com
13+
# postsubmit: 116606566869655215545: ebuild-dg05lqlr2tymodkwd5go6a9@prod-enforce-fabc.iam.gserviceaccount.com
14+
# world: 115998046588963941434: ebuild-d7lrzt8tuql0tod9242jkco@prod-enforce-fabc.iam.gserviceaccount.com
15+
subject_pattern: "(116478844699827634314|115457633213442188328|118305965159726888964|114870839879105817572|118124811908286464886|100027593799559093519|109278469796396932019|116606566869655215545|115998046588963941434)"
1216

1317
permissions:
1418
contents: read

.pre-commit-config.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
# Update with `pre-commit autoupdate --freeze` which
2+
# pins all repos using commit hashes, not mutable references
13
repos:
24
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
# Use commit hashes here, not tags.
45
rev: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b # v5.0.0
56
hooks:
67
- id: check-yaml
@@ -11,3 +12,8 @@ repos:
1112
- id: check-symlinks
1213
- id: detect-private-key
1314
exclude: ^ruby-3\.0/0001-ruby-3\.0\.6-openssl-patch\.patch$
15+
- repo: https://github.com/chainguard-dev/yam
16+
rev: 498642e77997ba79709f43a7ee2c84b12b2145bb # v0.2.12
17+
hooks:
18+
- id: yam
19+
files: ^[^/]+\.yaml$

Makefile

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,17 @@ KEY ?= local-melange.rsa
1616
REPO ?= $(shell pwd)/packages
1717
QEMU_KERNEL_REPO := https://apk.cgr.dev/chainguard-private/
1818

19-
ifneq (${MELANGE_RUNNER},)
20-
MELANGE_OPTS += --runner=${MELANGE_RUNNER}
21-
MELANGE_TEST_OPTS += --runner=${MELANGE_RUNNER}
19+
ifeq (${MELANGE_RUNNER},)
20+
MELANGE_RUNNER = qemu
21+
$(warning ****************************** WARNING ******************************)
22+
$(warning *** MELANGE_RUNNER is unset. The default runner is now qemu, which)
23+
$(warning *** requires chainctl authentication to access the Chainguard kernel.)
24+
$(warning *** See `melange build --help` for a list of other runner options.)
25+
$(warning ****************************** WARNING ******************************)
2226
endif
27+
28+
MELANGE_OPTS += --runner=${MELANGE_RUNNER}
29+
MELANGE_TEST_OPTS += --runner=${MELANGE_RUNNER}
2330
QEMU_KERNEL_IMAGE ?= kernel/$(ARCH)/vmlinuz
2431
ifeq (${MELANGE_RUNNER},qemu)
2532
QEMU_KERNEL_DEP = ${QEMU_KERNEL_IMAGE}

airflow.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: airflow
3-
version: "2.10.5"
4-
epoch: 43
3+
version: "2.11.0"
4+
epoch: 0
55
description: Platform to programmatically author, schedule, and monitor workflows
66
options:
77
# There is a dependency on libarrow.so although it
@@ -54,7 +54,7 @@ pipeline:
5454
with:
5555
repository: https://github.com/apache/airflow
5656
tag: ${{package.version}}
57-
expected-commit: b93c3db6b1641b0840bd15ac7d05bc58ff2cccbf
57+
expected-commit: d9ed7b94d033dc61ee1c05aafb9f1c1f7b82cfb2
5858

5959
- runs: |
6060
# By default, the airflow celery provider is not built, but running the upstream helm chart requires it
@@ -98,7 +98,7 @@ pipeline:
9898
#GHSA-8w49-h785-mj3c/GHSA-8495-4g3g-x7pr/GHSA-27mf-ghqm-j3j8 fixes
9999
pip3.12 install --verbose \
100100
--force-reinstall --prefix=/opt/airflow --root="${{targets.contextdir}}" \
101-
aiohttp>=3.10.11 tornado>=6.4.2 statsd packaging pyparsing \
101+
aiohttp>=3.10.11 tornado>=6.5.0 statsd packaging pyparsing \
102102
apache-airflow==${{package.version}} apache-airflow-providers-celery==3.10.0 "flask>=2.2.1,<2.3"
103103
# NOTE: apache-airflow-providers-celery is pinned to 3.10.0 because 3.10.3 introduced a regresssion.
104104
# https://github.com/apache/airflow/issues/47781 details more about it.

amazon-cloudwatch-agent.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: amazon-cloudwatch-agent
33
version: "1.300056.0"
4-
epoch: 0
4+
epoch: 1
55
description: CloudWatch Agent enables you to collect and export host-level metrics and logs on instances running Linux or Windows server.
66
copyright:
77
- license: Apache-2.0
@@ -19,7 +19,7 @@ pipeline:
1919
with:
2020
repository: https://github.com/aws/amazon-cloudwatch-agent
2121
tag: v${{package.version}}
22-
expected-commit: f9c10f2cd7d097ec55cb316a5195feec05ccf460
22+
expected-commit: 2e9286bb298345f88abe6df880803cce21d0713b
2323

2424
- uses: go/build
2525
with:

apache-arrow.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: apache-arrow
33
version: "20.0.0"
4-
epoch: 0
4+
epoch: 1
55
description: "multi-language toolbox for accelerated data interchange and in-memory processing"
66
copyright:
77
- license: Apache-2.0
@@ -168,6 +168,9 @@ subpackages:
168168
dependencies:
169169
runtime:
170170
- libarrow
171+
test:
172+
pipeline:
173+
- uses: test/tw/ldd-check
171174

172175
- name: "libarrow"
173176
description: "multi-language toolbox for accelerated data interchange and in-memory processing (libarrow library)"

argo-cd-3.0.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package:
22
name: argo-cd-3.0
3-
version: "3.0.1"
3+
version: "3.0.2"
44
epoch: 0
55
description: Declarative continuous deployment for Kubernetes.
66
copyright:
@@ -23,7 +23,7 @@ pipeline:
2323
with:
2424
repository: https://github.com/argoproj/argo-cd
2525
tag: v${{package.version}}
26-
expected-commit: 2bcef4877285db808e47b862567b278c3793d056
26+
expected-commit: 8a7c0f0c86b4a189669041fd4df671316fd4c977
2727

2828
- uses: go/bump
2929
with:

atmoz-sftp.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: atmoz-sftp
4-
version: "0.0.0_git20250512"
4+
version: "0.0.0_git20250519"
55
epoch: 0
66
description: Various scripts from https://github.com/atmoz/sftp to help run SFTP in a container
77
copyright:

aws-c-cal.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package:
22
name: aws-c-cal
3-
version: "0.9.0"
3+
version: "0.9.1"
44
epoch: 0
55
description: "AWS Crypto Abstraction Layer: Cross-Platform, C99 wrapper for cryptography primitives"
66
copyright:
@@ -20,7 +20,7 @@ environment:
2020
pipeline:
2121
- uses: git-checkout
2222
with:
23-
expected-commit: fa108de5280afd71018e0a0534edb36b33f030f6
23+
expected-commit: 938d0fea30d8476a7cf260278d636404682a28d4
2424
repository: https://github.com/awslabs/aws-c-cal
2525
tag: v${{package.version}}
2626

0 commit comments

Comments
 (0)