Skip to content

Commit b9e3629

Browse files
authored
Merge branch 'main' into feat/xfs_populate_patches
2 parents c93706d + f37f10d commit b9e3629

345 files changed

Lines changed: 1529 additions & 1625 deletions

File tree

Some content is hidden

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

.github/workflows/backfill.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
with:
2525
project_id: "prod-images-c6e5"
2626

27-
- uses: chainguard-dev/setup-chainctl@8d93dcbef466d3cf3533f67084f52eb74ef9d262 # v0.2.4
27+
- uses: chainguard-dev/setup-chainctl@272698817627c158bbd813cb783b62a4b9bbbc67 # v0.3.1
2828
with:
2929
# Managed here:
3030
# https://github.com/chainguard-dev/mono/blob/main/env/chainguard-images/iac/wolfi-os-pusher.tf
@@ -33,12 +33,6 @@ jobs:
3333
- name: 'Backfill packages to apk.cgr.dev'
3434
run: |
3535
set -e
36-
# Populate the token here, since chainctl auth token
37-
# doesn't support all of the options we need.
38-
chainctl auth login --audience apk.cgr.dev \
39-
--identity "720909c9f5279097d847ad02a2f24ba8f59de36a/6a26f2970f880c31"
40-
echo "::add-mask::$(chainctl auth token --audience apk.cgr.dev)"
41-
4236
for arch in "aarch64" "x86_64"; do
4337
echo "Processing ${arch}"
4438
while IFS= read -r pkg; do

.github/workflows/withdraw-packages.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
done
116116
117117
# use public chainguard provider.
118-
- uses: chainguard-dev/setup-chainctl@8d93dcbef466d3cf3533f67084f52eb74ef9d262 # v0.2.4
118+
- uses: chainguard-dev/setup-chainctl@272698817627c158bbd813cb783b62a4b9bbbc67 # v0.3.1
119119
with:
120120
# Managed here:
121121
# https://github.com/chainguard-dev/mono/blob/main/env/chainguard-images/iac/wolfi-os-pusher.tf
@@ -124,12 +124,6 @@ jobs:
124124
- name: 'Withdraw packages from apk.cgr.dev'
125125
run: |
126126
set -e
127-
# Populate the token here, since chainctl auth token
128-
# doesn't support all of the options we need.
129-
chainctl auth login --audience apk.cgr.dev \
130-
--identity "720909c9f5279097d847ad02a2f24ba8f59de36a/6a26f2970f880c31"
131-
echo "::add-mask::$(chainctl auth token --audience apk.cgr.dev)"
132-
133127
for arch in "aarch64" "x86_64"; do
134128
while IFS= read -r pkg; do
135129
curl -X DELETE \

abseil-cpp.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: abseil-cpp
33
version: "20250127.1" # On update, please check if -fdelete-null-pointer-checks is still required
4-
epoch: 1
4+
epoch: 2
55
description: Abseil Common Libraries (C++)
66
copyright:
77
- license: Apache-2.0

alsa-lib.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: alsa-lib
33
version: "1.2.14"
4-
epoch: 0
4+
epoch: 1
55
description: Advanced Linux Sound Architecture (ALSA) library
66
copyright:
77
- license: LGPL-2.1-or-later

aom.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package:
66
name: aom
77
version: "3.12.1"
8-
epoch: 0
8+
epoch: 1
99
description: Alliance for Open Media (AOM) AV1 codec SDK
1010
copyright:
1111
- license: BSD-2-Clause

apache-activemq-artemis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: apache-activemq-artemis
33
version: "2.41.0"
4-
epoch: 1
4+
epoch: 3
55
description: ActiveMQ Artemis is the next generation message broker from Apache ActiveMQ.
66
copyright:
77
- license: Apache-2.0
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
patches:
2-
- groupId: io.netty
3-
artifactId: netty-handler
4-
version: 4.1.118.Final
2+
- groupId: io.netty
3+
artifactId: netty-handler
4+
version: 4.1.118.Final
5+
- groupId: commons-beanutils
6+
artifactId: commons-beanutils
7+
version: 1.11.0

apache-nifi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: apache-nifi
33
version: "2.4.0"
4-
epoch: 0
4+
epoch: 1
55
description: Apache NiFi is an easy to use, powerful, and reliable system to process and distribute data.
66
copyright:
77
- license: Apache-2.0

apache-nifi/pombump-deps.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@ patches:
1111
- groupId: wire-runtime
1212
artifactId: wire-runtime
1313
version: 5.2.0
14+
- groupId: commons-beanutils
15+
artifactId: commons-beanutils
16+
version: 1.11.0

apicurio-registry.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: apicurio-registry
33
version: "3.0.7"
4-
epoch: 1
4+
epoch: 3
55
description: An API/Schema registry - stores APIs and Schemas
66
copyright:
77
- license: Apache-2.0

0 commit comments

Comments
 (0)