Skip to content

Commit 17494ba

Browse files
amberarcadiaamberarcadia
authored
Merge branch 'main' into wolfictl-0f156c0a-f6e4-484f-aae1-59586a9aa6b8
2 parents add1fc8 + 760cd6d commit 17494ba

17 files changed

+374
-44
lines changed

‎apko.yaml

+11-14
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,28 @@ package:
99
runtime:
1010
- ca-certificates-bundle
1111

12-
environment:
13-
contents:
14-
packages:
15-
- build-base
16-
- busybox
17-
- ca-certificates-bundle
18-
- go
19-
2012
pipeline:
2113
- uses: git-checkout
2214
with:
2315
repository: https://github.com/chainguard-dev/apko
2416
tag: v${{package.version}}
2517
expected-commit: c487bbf94532e4708c3717f4ef1ef47166e56d5f
2618

27-
- runs: |
28-
make apko
29-
install -m755 -D ./apko "${{targets.contextdir}}"/usr/bin/apko
30-
31-
- uses: strip
19+
- uses: go/build
20+
with:
21+
output: apko
22+
packages: .
23+
ldflags: |
24+
-buildid= \
25+
-X sigs.k8s.io/release-utils/version.gitVersion=$(git describe --dirty --tags --always) \
26+
-X sigs.k8s.io/release-utils/version.gitCommit=$(git rev-parse HEAD) \
27+
-X sigs.k8s.io/release-utils/version.gitTreeState=$(shell git diff --quiet >/dev/null 2>&1 || echo "dirty" || echo "clean") \
28+
-X sigs.k8s.io/release-utils/version.buildDate=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
3229
3330
test:
3431
pipeline:
3532
- runs: |
36-
apko version || exit 1
33+
apko version | grep ${{package.version}}
3734
apko --help
3835
- runs: |
3936
cat <<EOF >> /tmp/wolfi-base.yaml

‎helm-push.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ pipeline:
4646
golang.org/x/crypto@v0.35.0
4747
golang.org/x/oauth2@v0.27.0
4848
golang.org/x/net@v0.36.0
49-
replaces: github.com/containerd/containerd=github.com/containerd/containerd@v1.6.26 helm.sh/helm/v3=helm.sh/helm/v3@v3.14.2
49+
github.com/containerd/containerd@v1.6.38
50+
replaces: github.com/containerd/containerd=github.com/containerd/containerd@v1.6.38 helm.sh/helm/v3=helm.sh/helm/v3@v3.14.2
5051

5152
# Dropping helm plugins in /usr/libexec since they are binaries and
5253
# configuration intended to be run by the helm command.

‎llvm-lld-15.yaml

+14-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: llvm-lld-15
33
version: 15.0.7
4-
epoch: 4
4+
epoch: 5
55
description: The LLVM Linker
66
copyright:
77
- license: Apache-2.0
@@ -82,3 +82,16 @@ update:
8282
use-tag: true
8383
tag-filter: llvmorg-15.
8484
strip-prefix: llvmorg-
85+
86+
test:
87+
pipeline:
88+
- runs: |
89+
ld.lld --version
90+
ld.lld --help
91+
ld64.lld --version
92+
ld64.lld --help
93+
lld-link --version
94+
lld-link -help
95+
wasm-ld --version
96+
wasm-ld --help
97+
lld 2>&1 | grep "lld is a generic driver"

‎llvm-lld-16.yaml

+14-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: llvm-lld-16
33
version: 16.0.6
4-
epoch: 7
4+
epoch: 8
55
description: The LLVM Linker
66
copyright:
77
- license: Apache-2.0
@@ -80,3 +80,16 @@ update:
8080
use-tag: true
8181
tag-filter: llvmorg-16.
8282
strip-prefix: llvmorg-
83+
84+
test:
85+
pipeline:
86+
- runs: |
87+
ld.lld --version
88+
ld.lld --help
89+
ld64.lld --version
90+
ld64.lld --help
91+
lld-link --version
92+
lld-link -help
93+
wasm-ld --version
94+
wasm-ld --help
95+
lld 2>&1 | grep "lld is a generic driver"

‎llvm-lld-17.yaml

+14-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: llvm-lld-17
33
version: 17.0.6
4-
epoch: 2
4+
epoch: 3
55
description: The LLVM Linker
66
copyright:
77
- license: Apache-2.0
@@ -80,3 +80,16 @@ update:
8080
use-tag: true
8181
tag-filter: llvmorg-17.
8282
strip-prefix: llvmorg-
83+
84+
test:
85+
pipeline:
86+
- runs: |
87+
ld.lld --version
88+
ld.lld --help
89+
ld64.lld --version
90+
ld64.lld --help
91+
lld-link --version
92+
lld-link -help
93+
wasm-ld --version
94+
wasm-ld --help
95+
lld 2>&1 | grep "lld is a generic driver"

‎nats.yaml

+3-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: nats
3-
version: 0.1.6
4-
epoch: 5
3+
version: "0.2.0"
4+
epoch: 0
55
description: The NATS Command Line Interface.
66
copyright:
77
- license: Apache-2.0
@@ -20,14 +20,7 @@ pipeline:
2020
with:
2121
repository: https://github.com/nats-io/natscli
2222
tag: v${{package.version}}
23-
expected-commit: d1716253e682466ee53d51c740b819a31a436e65
24-
25-
- uses: go/bump
26-
with:
27-
deps: |-
28-
golang.org/x/crypto@v0.35.0
29-
golang.org/x/net@v0.36.0
30-
github.com/expr-lang/expr@v1.17.0
23+
expected-commit: 7c8f9bc33d6eff06360128ad6bb49c403db387d2
3124

3225
- uses: go/build
3326
with:

‎newrelic-infra-operator.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: newrelic-infra-operator
33
version: "0.21.6"
4-
epoch: 2
4+
epoch: 3
55
description: Newrelic kubernetes operator of infrastructure
66
copyright:
77
- license: Apache-2.0
@@ -41,3 +41,8 @@ update:
4141
strip-prefix: v
4242
tag-filter: v
4343
use-tag: true
44+
45+
test:
46+
pipeline:
47+
- runs: |
48+
newrelic-infra-operator 2>&1 | grep "Starting NewRelic infra operator"

‎newrelic-infrastructure-bundle.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package:
22
name: newrelic-infrastructure-bundle
3-
version: "3.2.69"
3+
version: "3.2.70"
44
epoch: 0
55
description: New Relic Infrastructure containerised agent bundle
66
copyright:
@@ -58,7 +58,7 @@ pipeline:
5858
with:
5959
repository: https://github.com/newrelic/infrastructure-bundle
6060
tag: v${{package.version}}
61-
expected-commit: dd1cfdd7b0dd81cdd289f685a6496861992698e1
61+
expected-commit: f4dd989574da0477c62731ad82c250ef7f12f6d6
6262
destination: ${{package.name}}
6363

6464
update:

‎newrelic-nri-statsd.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: newrelic-nri-statsd
3-
version: 2.10.0
4-
epoch: 31
3+
version: "2.11.0"
4+
epoch: 0
55
description: An implementation of Etsy's statsd in Go with tags support
66
copyright:
77
- license: MIT
@@ -22,7 +22,7 @@ environment:
2222
pipeline:
2323
- uses: git-checkout
2424
with:
25-
expected-commit: 21cb52ec9480869d1ff01675b9ed550cc9212c49
25+
expected-commit: b41478db063f0eb025907a18e936c26f291ab5e3
2626
repository: https://github.com/newrelic/nri-statsd
2727
tag: v${{package.version}}
2828

‎ninja-build.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
package:
1010
name: ninja-build
1111
version: 1.12.1
12-
epoch: 1
12+
epoch: 2
1313
description: "Ninja is a small build system with a focus on speed."
1414
copyright:
1515
- license: Apache-2.0
@@ -48,3 +48,9 @@ update:
4848
github:
4949
identifier: ninja-build/ninja
5050
strip-prefix: v
51+
52+
test:
53+
pipeline:
54+
- runs: |
55+
/usr/lib/ninja-build/bin/ninja --version
56+
/usr/lib/ninja-build/bin/ninja --help 2>&1 | grep -q "^usage:"

‎nrjmx.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: nrjmx
33
version: "2.7.0"
4-
epoch: 0
4+
epoch: 2
55
description: Command line tool to connect to a JMX server and retrieve the MBeans it exposes
66
copyright:
77
- license: Apache-2.0

‎parseable.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package:
22
name: parseable
3-
version: "1.7.4"
3+
version: "1.7.5"
44
epoch: 0
55
description: "Parseable is a log analytics system built for high throughput log ingestion cases."
66
copyright:
@@ -21,7 +21,7 @@ pipeline:
2121
with:
2222
repository: https://github.com/parseablehq/parseable
2323
tag: v${{package.version}}
24-
expected-commit: ddd8c892c7cf3be39c57cf59b6e6cefdc4b80d87
24+
expected-commit: 6e5242f08657ff08d93944811f596a019079b011
2525

2626
- uses: rust/cargobump
2727

‎py3-bcrypt-3.2.yaml

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
package:
2+
name: py3-bcrypt-3.2
3+
version: "3.2.2"
4+
epoch: 0
5+
description: Modern password hashing for your software and your servers
6+
copyright:
7+
- license: Apache-2.0
8+
dependencies:
9+
provider-priority: 0
10+
11+
vars:
12+
pypi-package: bcrypt
13+
import: bcrypt
14+
15+
data:
16+
- name: py-versions
17+
items:
18+
3.10: '310'
19+
3.11: '311'
20+
3.12: '312'
21+
3.13: '313'
22+
23+
environment:
24+
contents:
25+
packages:
26+
- py3-supported-build-base-dev
27+
- py3-supported-cffi
28+
29+
pipeline:
30+
- uses: git-checkout
31+
with:
32+
expected-commit: a86360fef7859054c6a8050cf67e62127f5e2643
33+
repository: https://github.com/pyca/bcrypt
34+
tag: ${{package.version}}
35+
36+
subpackages:
37+
- range: py-versions
38+
name: py${{range.key}}-${{vars.pypi-package}}-3.2
39+
description: python${{range.key}} version of ${{vars.pypi-package}}
40+
dependencies:
41+
provider-priority: ${{range.value}}
42+
provides:
43+
- py3-${{vars.pypi-package}}
44+
runtime:
45+
- py${{range.key}}-cffi
46+
pipeline:
47+
- uses: py/pip-build-install
48+
with:
49+
python: python${{range.key}}
50+
- uses: strip
51+
test:
52+
pipeline:
53+
- uses: python/import
54+
with:
55+
python: python${{range.key}}
56+
imports: |
57+
import ${{vars.import}}
58+
59+
- name: py3-supported-${{vars.pypi-package}}-3.2
60+
description: meta package providing ${{vars.pypi-package}} for supported python versions.
61+
dependencies:
62+
runtime:
63+
- py3.10-${{vars.pypi-package}}-3.2
64+
- py3.11-${{vars.pypi-package}}-3.2
65+
- py3.12-${{vars.pypi-package}}-3.2
66+
- py3.13-${{vars.pypi-package}}-3.2
67+
test:
68+
pipeline:
69+
- uses: python/import
70+
with:
71+
python: python3.10
72+
import: ${{vars.pypi-package}}
73+
74+
update:
75+
enabled: true
76+
manual: false
77+
github:
78+
identifier: pyca/bcrypt
79+
use-tag: true
80+
tag-filter: 3.2.

0 commit comments

Comments
 (0)