Skip to content

Commit 0fa9846

Browse files
AmberArcadiaAmberArcadia
authored
Merge branch 'main' into wolfictl-c417f17b-f42c-4035-b708-4418aa0dda2d
2 parents ae2c991 + 6e684ba commit 0fa9846

File tree

244 files changed

+3193
-1054
lines changed

Some content is hidden

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

244 files changed

+3193
-1054
lines changed

‎actions-runner-controller.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package:
22
name: actions-runner-controller
3-
version: "0.12.0"
3+
version: "0.12.1"
44
epoch: 0
55
description: Kubernetes controller for GitHub Actions self-hosted runners
66
copyright:
@@ -18,7 +18,7 @@ pipeline:
1818
with:
1919
repository: https://github.com/actions/actions-runner-controller
2020
tag: gha-runner-scale-set-${{package.version}}
21-
expected-commit: d9826e5244867626c7247ceb63e1a3a87e1a0331
21+
expected-commit: ded39bede6da17f807d0b3430e9970d00216f156
2222

2323
- uses: go/build
2424
with:

‎amazon-cloudwatch-agent-operator.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: amazon-cloudwatch-agent-operator
33
version: "3.1.0"
4-
epoch: 0
4+
epoch: 1
55
description: Software developed to manage the CloudWatch Agent on kubernetes.
66
copyright:
77
- license: Apache-2.0
@@ -13,6 +13,11 @@ pipeline:
1313
repository: https://github.com/aws/amazon-cloudwatch-agent-operator
1414
tag: v${{package.version}}
1515

16+
- uses: go/bump
17+
with:
18+
deps: |-
19+
github.com/go-viper/mapstructure/v2@v2.3.0
20+
1621
- uses: go/build
1722
with:
1823
output: manager

‎amazon-cloudwatch-agent.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: amazon-cloudwatch-agent
33
version: "1.300057.0"
4-
epoch: 2
4+
epoch: 3
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
@@ -21,6 +21,11 @@ pipeline:
2121
tag: v${{package.version}}
2222
expected-commit: de987cd83f7aa68932cf7f1870b8342a94a6cb4d
2323

24+
- uses: go/bump
25+
with:
26+
deps: |-
27+
github.com/go-viper/mapstructure/v2@v2.3.0
28+
2429
- uses: go/build
2530
with:
2631
packages: ./cmd/amazon-cloudwatch-agent

‎apache-tika-3.2.yaml

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
package:
2+
name: apache-tika-3.2
3+
version: "3.2.0"
4+
epoch: 0
5+
description: The Apache Tika toolkit detects and extracts metadata and text from over a thousand different file types (such as PPT, XLS, and PDF).
6+
copyright:
7+
- license: Apache-2.0
8+
dependencies:
9+
runtime:
10+
- dash-binsh
11+
- openjdk-21-default-jvm
12+
provides:
13+
- apache-tika=${{package.full-version}}
14+
15+
environment:
16+
contents:
17+
packages:
18+
- bash
19+
- build-base
20+
- busybox
21+
- coreutils
22+
- fontconfig-config
23+
- fontconfig-dev
24+
- lcms2
25+
- libfontconfig1
26+
- libjpeg-turbo
27+
- maven
28+
- openjdk-21-default-jdk
29+
30+
pipeline:
31+
- uses: fetch
32+
with:
33+
uri: https://downloads.apache.org/tika/${{package.version}}/tika-${{package.version}}-src.zip
34+
expected-sha512: 3882a1c1e4dc38de6491b1b9cf686ec703e958a38f4d09821c422ecacdbc0f5c8490c511c9d3875b8e8bfe79176a3febf37e62dcf3897ec3e1f413b99955f218
35+
extract: false
36+
37+
- runs: |
38+
unzip tika-${{package.version}}-src.zip
39+
mv tika-${{package.version}}/* .
40+
rm tika-${{package.version}}-src.zip
41+
rmdir tika-${{package.version}}
42+
43+
- uses: auth/maven
44+
45+
- runs: |
46+
mvn clean install -am -DskipTests -Dossindex.skip
47+
mkdir -p "${{targets.contextdir}}"/usr/share/java/
48+
cp -r tika-server/tika-server-standard/target/tika-server-standard-${{package.version}}.jar "${{targets.contextdir}}"/usr/share/java/tika-server-standard-${{package.version}}.jar
49+
50+
subpackages:
51+
- name: "${{package.name}}-compat"
52+
description: "Compatibility package to place binaries in the root folder"
53+
pipeline:
54+
- runs: |
55+
mkdir -p "${{targets.subpkgdir}}"
56+
ln -sf /usr/share/java/tika-server-standard-${{package.version}}.jar ${{targets.subpkgdir}}/tika-server-standard.jar
57+
58+
update:
59+
enabled: true
60+
release-monitor:
61+
identifier: 15703
62+
version-filter-contains: 3.2.
63+
64+
test:
65+
environment:
66+
contents:
67+
packages:
68+
- curl
69+
- ${{package.name}}-compat
70+
- openjdk-21-default-jvm
71+
pipeline:
72+
- uses: test/daemon-check-output
73+
with:
74+
start: java -jar /tika-server-standard.jar
75+
expected_output: |
76+
Started Apache Tika server
77+
post: |
78+
fail() { echo "FATAL: $*"; exit 1; }
79+
tmpd=$(mktemp -d)
80+
trap "rm -Rf $tmpd" EXIT
81+
82+
url=http://localhost:9998/
83+
curl -s "$url" > "$tmpd/req.out" 2>"$tmpd/req.err" ||
84+
fail "[$?] curl -s $url"
85+
grep -q "Welcome to the Apache Tika" "$tmpd/req.out" ||
86+
fail "curl $url - no Welcome message"
87+
88+
msg="this is a test file"
89+
echo "$msg" > "$tmpd/sample.txt" ||
90+
fail "failed writing a file"
91+
curl -X PUT --data-binary "@$tmpd/sample.txt" \
92+
-H "Content-Type: text/plain" "http://localhost:9998/tika" \
93+
> "$tmpd/post.out" ||
94+
fail "failed PUT to curl $url/tika"
95+
grep -q "$msg" "$tmpd/post.out" ||
96+
fail "did not find $msg in output of PUT"

‎apko.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: apko
3-
version: "0.27.9"
4-
epoch: 1
3+
version: "0.28.0"
4+
epoch: 0
55
description: Build OCI images using APK directly without Dockerfile
66
copyright:
77
- license: Apache-2.0
@@ -14,7 +14,7 @@ pipeline:
1414
with:
1515
repository: https://github.com/chainguard-dev/apko
1616
tag: v${{package.version}}
17-
expected-commit: 914a57446266dc29e612ebbc2669c1045625880d
17+
expected-commit: 09497eb9ecf658a2b64184ca846ab2ce16711c4d
1818

1919
- uses: go/build
2020
with:

‎argo-events.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: argo-events
33
version: "1.9.6"
4-
epoch: 3
4+
epoch: 4
55
description: Event-driven Automation Framework for Kubernetes.
66
copyright:
77
- license: Apache-2.0
@@ -18,6 +18,7 @@ pipeline:
1818
deps: |-
1919
golang.org/x/net@v0.38.0
2020
github.com/cloudflare/circl@v1.6.1
21+
github.com/go-viper/mapstructure/v2@v2.3.0
2122
replaces: github.com/whilp/git-urls=github.com/chainguard-dev/git-urls@v1.0.2
2223

2324
- uses: go/build

‎atlantis.yaml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: atlantis
3-
version: "0.34.0"
4-
epoch: 3
3+
version: "0.35.0"
4+
epoch: 1
55
description: Terraform Pull Request Automation
66
copyright:
77
- license: Apache-2.0
@@ -24,18 +24,12 @@ pipeline:
2424
with:
2525
repository: https://github.com/runatlantis/atlantis
2626
tag: v${{package.version}}
27-
expected-commit: 551b4d057bfe9017c3d16c889d46ff7088e7a160
27+
expected-commit: 81175988d2b1f6b4d3dba4c19bfc7cb4ace01e9e
2828

2929
- uses: go/bump
3030
with:
3131
deps: |-
32-
github.com/cloudflare/circl@v1.6.1
33-
34-
- uses: go/bump
35-
with:
36-
deps: |-
37-
golang.org/x/net@v0.38.0
38-
modroot: .
32+
github.com/go-viper/mapstructure/v2@v2.3.0
3933
4034
- uses: go/build
4135
with:

‎aws-c-s3.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-s3
3-
version: "0.8.2"
3+
version: "0.8.3"
44
epoch: 0
55
description: "AWS C99 library implementation for communicating with the S3 service"
66
copyright:
@@ -36,7 +36,7 @@ environment:
3636
pipeline:
3737
- uses: git-checkout
3838
with:
39-
expected-commit: 29ceb352fcd907fc89c819714e380d3f244ce72c
39+
expected-commit: 1762f839fdca78ec4b30dc94fbbd88591d0b5b7c
4040
repository: https://github.com/awslabs/aws-c-s3
4141
tag: v${{package.version}}
4242

‎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.27.44"
5+
version: "2.27.45"
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: 7c950bdfa926c29ba53505723ebd0fb0c32b1335
42+
expected-commit: e86184a1dc80f1041d3b7723f1e4b2e2ce4652c9
4343
tag: ${{package.version}}
4444

4545
- runs: |

‎aws-otel-collector.yaml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: aws-otel-collector
33
version: 0.43.3
4-
epoch: 1
4+
epoch: 2
55
description: AWS distro for OpenTelemetry Collector
66
copyright:
77
- license: Apache-2.0
@@ -13,6 +13,23 @@ pipeline:
1313
repository: https://github.com/aws-observability/aws-otel-collector
1414
tag: v${{package.version}}
1515

16+
- uses: go/bump
17+
with:
18+
deps: |-
19+
github.com/go-viper/mapstructure/v2@v2.3.0
20+
modroot: tools/workflow/linters
21+
22+
- uses: go/bump
23+
with:
24+
deps: |-
25+
github.com/go-viper/mapstructure/v2@v2.3.0
26+
modroot: testbed
27+
28+
- uses: go/bump
29+
with:
30+
deps: |-
31+
github.com/go-viper/mapstructure/v2@v2.3.0
32+
1633
- uses: go/build
1734
with:
1835
packages: ./cmd/awscollector

0 commit comments

Comments
 (0)