From fbe464351acddebd111c90407d23ce458f5b1215 Mon Sep 17 00:00:00 2001 From: Will Dollman Date: Tue, 16 Apr 2024 22:02:15 +0100 Subject: [PATCH] Add package update metadata (#61935) * Add update config for universal-ctags * Add upstream monitoring for additional packages * Add context to disabled release checking * Fix s3proxy upstream * Remove todo * Bump package epochs * Revert gke-gcloud epoch bump * Revert changes for packages that fail builds * Fixup p4 packages * Remove syntect-server package This binary is built with Bazel now --- wolfi-packages/comby.yaml | 7 +++- wolfi-packages/coursier.yaml | 5 ++- wolfi-packages/ctags.yaml | 8 +++- wolfi-packages/docker-client.yaml | 6 ++- wolfi-packages/http-server-stabilizer.yaml | 8 +++- wolfi-packages/jaeger.yaml | 8 +++- wolfi-packages/opentelemetry-collector.yaml | 8 +++- wolfi-packages/p4-fusion-sg.yaml | 7 +++- wolfi-packages/p4-fusion.yaml | 8 +++- wolfi-packages/p4cli.yaml | 7 +++- wolfi-packages/qdrant.yaml | 8 +++- wolfi-packages/redis_exporter.yaml | 8 +++- wolfi-packages/syntect-server.yaml | 45 --------------------- wolfi-packages/terraform.yaml | 4 +- wolfi-packages/xmlstarlet.yaml | 7 +++- 15 files changed, 82 insertions(+), 62 deletions(-) delete mode 100644 wolfi-packages/syntect-server.yaml diff --git a/wolfi-packages/comby.yaml b/wolfi-packages/comby.yaml index 845f73c19b3..8617e0d1dd0 100644 --- a/wolfi-packages/comby.yaml +++ b/wolfi-packages/comby.yaml @@ -1,7 +1,7 @@ package: name: comby version: 1.8.1 - epoch: 3 + epoch: 4 description: "A code rewrite tool for structural search and replace that supports ~every language." target-architecture: - x86_64 @@ -64,3 +64,8 @@ pipeline: - runs: | mkdir -p ${{targets.destdir}}/usr/bin/ cp $HOME/.opam/4.11.0/bin/comby ${{targets.destdir}}/usr/bin/ + +update: + enabled: true + github: + identifier: comby-tools/comby diff --git a/wolfi-packages/coursier.yaml b/wolfi-packages/coursier.yaml index f21553e3d59..9a4de18fa11 100644 --- a/wolfi-packages/coursier.yaml +++ b/wolfi-packages/coursier.yaml @@ -4,7 +4,7 @@ package: name: coursier version: 2.0.13 # IMPORTANT: Coursier uses a non-standard release model, so updating this version alone will not update the package - epoch: 2 + epoch: 3 description: "Java dependency resolver" target-architecture: - x86_64 @@ -36,3 +36,6 @@ pipeline: mkdir -p ${{targets.destdir}}/usr/local/bin/ chmod +x cs-x86_64-pc-linux cp cs-x86_64-pc-linux ${{targets.destdir}}/usr/local/bin/coursier + +update: + enabled: false # No easy way to get release hashes diff --git a/wolfi-packages/ctags.yaml b/wolfi-packages/ctags.yaml index 9c59584e950..e8809e51067 100644 --- a/wolfi-packages/ctags.yaml +++ b/wolfi-packages/ctags.yaml @@ -4,7 +4,7 @@ package: name: ctags version: 6.0.0 - epoch: 4 + epoch: 5 description: "A maintained ctags implementation" target-architecture: - x86_64 @@ -47,3 +47,9 @@ pipeline: - uses: autoconf/make - uses: autoconf/make-install - uses: strip + +update: + enabled: true + github: + identifier: universal-ctags/ctags + strip-prefix: "Universal Ctags " diff --git a/wolfi-packages/docker-client.yaml b/wolfi-packages/docker-client.yaml index 794304a441b..d9fb088bc5f 100644 --- a/wolfi-packages/docker-client.yaml +++ b/wolfi-packages/docker-client.yaml @@ -1,7 +1,7 @@ package: name: docker-client version: 24.0.0 - epoch: 2 + epoch: 3 description: "Docker client binary - excludes container runtime" target-architecture: - x86_64 @@ -34,3 +34,7 @@ pipeline: mkdir -p ${{targets.destdir}}/usr/bin/ cp docker/docker ${{targets.destdir}}/usr/bin/ +update: + enabled: true + release-monitor: + identifier: 11719 # https://release-monitoring.org/project/11719/ diff --git a/wolfi-packages/http-server-stabilizer.yaml b/wolfi-packages/http-server-stabilizer.yaml index ec298ad93c2..38494e70ec1 100644 --- a/wolfi-packages/http-server-stabilizer.yaml +++ b/wolfi-packages/http-server-stabilizer.yaml @@ -3,7 +3,7 @@ package: name: http-server-stabilizer version: 1.1.0 - epoch: 2 + epoch: 3 description: "HTTP server stabilizer for unruly servers" target-architecture: - x86_64 @@ -34,3 +34,9 @@ pipeline: packages: ./... prefix: /usr/local output: http-server-stabilizer + +update: + enabled: true + github: + identifier: sourcegraph/http-server-stabilizer + strip-prefix: "v" diff --git a/wolfi-packages/jaeger.yaml b/wolfi-packages/jaeger.yaml index 4442f8c67ae..0baf5f6eea1 100644 --- a/wolfi-packages/jaeger.yaml +++ b/wolfi-packages/jaeger.yaml @@ -4,7 +4,7 @@ package: name: jaeger version: 1.45.0 # Keep in sync with version in sg.config.yaml - epoch: 6 + epoch: 7 description: "Distributed Tracing Platform" target-architecture: - x86_64 @@ -53,3 +53,9 @@ subpackages: set -x mkdir -p "${{targets.subpkgdir}}/usr/local/bin/" cp "${{targets.destdir}}/usr/local/bin/jaeger-all-in-one" "${{targets.subpkgdir}}/usr/local/bin/" + +update: + enabled: true + github: + identifier: jaegertracing/jaeger + strip-prefix: "Release " diff --git a/wolfi-packages/opentelemetry-collector.yaml b/wolfi-packages/opentelemetry-collector.yaml index 06bb7556696..bf770ff1d95 100644 --- a/wolfi-packages/opentelemetry-collector.yaml +++ b/wolfi-packages/opentelemetry-collector.yaml @@ -1,7 +1,7 @@ package: name: opentelemetry-collector version: 0.92.0 # Keep in sync with go.opentelemetry.io/collector version in go.mod - epoch: 5 + epoch: 6 description: "Vendor-agnostic implementation on how to receive, process and export telemetry data" target-architecture: - x86_64 @@ -45,3 +45,9 @@ pipeline: runs: | mkdir -p ${{targets.destdir}}/bin/ cp /tmp/otelcol-sourcegraph/otelcol-sourcegraph ${{targets.destdir}}/bin/otelcol-sourcegraph + +update: + enabled: true + github: + identifier: open-telemetry/opentelemetry-collector + strip-prefix: "v" diff --git a/wolfi-packages/p4-fusion-sg.yaml b/wolfi-packages/p4-fusion-sg.yaml index f187d07408a..8da7a3dbe58 100644 --- a/wolfi-packages/p4-fusion-sg.yaml +++ b/wolfi-packages/p4-fusion-sg.yaml @@ -3,7 +3,7 @@ package: name: p4-fusion-sg version: 1.13.2 - epoch: 2 + epoch: 3 description: "A fast Perforce to Git conversion tool, Sourcegraph fork" target-architecture: - x86_64 @@ -57,7 +57,7 @@ pipeline: with: uri: https://filehost.perforce.com/perforce/r23.1/bin.linux26x86_64/p4api-glibc2.3-openssl1.1.1.tgz # Hash occasionally changes, available at https://filehost.perforce.com/perforce/r23.1/bin.linux26x86_64/SHA256SUMS (check version) - expected-sha256: bc4d81e8d594d50645a573c75a75cf5e3140d987eba3d14ffc775dc704fb400b # based on url + expected-sha256: b6e391a2b288f363693aeae2620188500f3e555d4382bcc2356d7721085a9062 # based on url extract: false - runs: | mkdir -p p4-fusion-src/vendor/helix-core-api/linux @@ -84,3 +84,6 @@ pipeline: - runs: | mkdir -p ${{targets.destdir}}/usr/local/bin/ cp p4-fusion-src/build/p4-fusion/p4-fusion ${{targets.destdir}}/usr/local/bin/p4-fusion-binary + +update: + enabled: false # Our p4-fusion fork does not provide releases or tags diff --git a/wolfi-packages/p4-fusion.yaml b/wolfi-packages/p4-fusion.yaml index dbf83c9c20c..24418f440b4 100644 --- a/wolfi-packages/p4-fusion.yaml +++ b/wolfi-packages/p4-fusion.yaml @@ -3,7 +3,7 @@ package: name: p4-fusion version: 1.12 - epoch: 9 + epoch: 10 description: "A fast Perforce to Git conversion tool" target-architecture: - x86_64 @@ -84,3 +84,9 @@ pipeline: - runs: | mkdir -p ${{targets.destdir}}/usr/local/bin/ cp p4-fusion-src/build/p4-fusion/p4-fusion ${{targets.destdir}}/usr/local/bin/p4-fusion-binary + +update: + enabled: true + github: + identifier: salesforce/p4-fusion + strip-prefix: "p4-fusion v" diff --git a/wolfi-packages/p4cli.yaml b/wolfi-packages/p4cli.yaml index 334d73f8f5e..6071d3608bc 100644 --- a/wolfi-packages/p4cli.yaml +++ b/wolfi-packages/p4cli.yaml @@ -1,7 +1,7 @@ package: name: p4cli version: 23.1 - epoch: 2 + epoch: 3 description: "Command line interface for Perforce" target-architecture: - x86_64 @@ -27,9 +27,12 @@ pipeline: with: uri: https://filehost.perforce.com/perforce/r${{package.version}}/bin.linux26x86_64/p4 # Hash occasionally changes, available at https://filehost.perforce.com/perforce/r23.1/bin.linux26x86_64/SHA256SUMS (check version) - expected-sha256: 1c053276f9379a55cfe98b0c191e03bec7d1d1673b416c7b9e1613cff699833a + expected-sha256: bc13b6447e7b4e6e24048595b3d796143912bd38bc511a8470b3dba27499ddfc extract: false - runs: | chmod +x p4 mkdir -p ${{targets.destdir}}/usr/local/bin/ cp p4 ${{targets.destdir}}/usr/local/bin/p4 + +update: + enabled: false # No monitoring available diff --git a/wolfi-packages/qdrant.yaml b/wolfi-packages/qdrant.yaml index 1a61dfb72f7..80544459b1d 100644 --- a/wolfi-packages/qdrant.yaml +++ b/wolfi-packages/qdrant.yaml @@ -1,7 +1,7 @@ package: name: qdrant version: 1.5.1 - epoch: 2 + epoch: 3 description: "Qdrant vector database" target-architecture: - x86_64 @@ -33,3 +33,9 @@ pipeline: chmod +x qdrant mkdir -p ${{targets.destdir}}/usr/local/bin mv qdrant ${{targets.destdir}}/usr/local/bin/qdrant + +update: + enabled: true + github: + identifier: qdrant/qdrant + strip-prefix: "v" diff --git a/wolfi-packages/redis_exporter.yaml b/wolfi-packages/redis_exporter.yaml index f1b36af845f..2c4063603b7 100644 --- a/wolfi-packages/redis_exporter.yaml +++ b/wolfi-packages/redis_exporter.yaml @@ -1,7 +1,7 @@ package: name: redis_exporter version: 1.35.0 - epoch: 2 + epoch: 3 description: "Prometheus Exporter for Redis Metrics" target-architecture: - x86_64 @@ -35,3 +35,9 @@ pipeline: ldflags: "-s -w -extldflags \"-static\"" prefix: /usr/local output: redis_exporter + +update: + enabled: true + github: + identifier: oliver006/redis_exporter + strip-prefix: "v" diff --git a/wolfi-packages/syntect-server.yaml b/wolfi-packages/syntect-server.yaml deleted file mode 100644 index 13b657f372b..00000000000 --- a/wolfi-packages/syntect-server.yaml +++ /dev/null @@ -1,45 +0,0 @@ -# Melange-based replacement for https://sourcegraph.sourcegraph.com/github.com/sourcegraph/sourcegraph/-/blob/docker-images/syntax-highlighter/Dockerfile?L2 - -package: - name: syntect-server - version: 4.3 - epoch: 0 - description: "HTTP server stabilizer for unruly servers" - target-architecture: - - x86_64 - copyright: - - paths: - - "*" - attestation: 'Copyright (c) 2017 Sourcegraph' - license: 'MIT License' - dependencies: - runtime: - -environment: - contents: - repositories: - - https://packages.wolfi.dev/os - keyring: - - https://packages.wolfi.dev/os/wolfi-signing.rsa.pub - packages: - - wolfi-base - - build-base - - rust - -pipeline: - # Tie version of syntect-server to Sourcegraph release - - uses: git-checkout - with: - repository: https://github.com/sourcegraph/sourcegraph/ - branch: ${{package.version}} - destination: /sourcegraph - - - runs: | - cd /sourcegraph/docker-images/syntax-highlighter - cargo test --release --workspace - cargo rustc --release - - - runs: | - cd /sourcegraph/docker-images/syntax-highlighter - mkdir -p ${{targets.destdir}}/usr/local/bin/ - cp target/release/syntect_server ${{targets.destdir}}/usr/local/bin/syntax_highlighter diff --git a/wolfi-packages/terraform.yaml b/wolfi-packages/terraform.yaml index dd082d2718a..3c9a7537b86 100644 --- a/wolfi-packages/terraform.yaml +++ b/wolfi-packages/terraform.yaml @@ -19,7 +19,7 @@ package: name: terraform version: 1.5.6 - epoch: 1 + epoch: 2 copyright: - license: BUSL-1.1 @@ -73,4 +73,4 @@ subpackages: EOF update: - enabled: false + enabled: false # Licensing issues diff --git a/wolfi-packages/xmlstarlet.yaml b/wolfi-packages/xmlstarlet.yaml index 6f403bf834e..ac3c1979754 100644 --- a/wolfi-packages/xmlstarlet.yaml +++ b/wolfi-packages/xmlstarlet.yaml @@ -1,7 +1,7 @@ package: name: xmlstarlet version: 1.6.1 - epoch: 2 + epoch: 3 description: "" target-architecture: - x86_64 @@ -41,3 +41,8 @@ pipeline: mkdir -p ${{targets.destdir}}/usr/bin/ cp /usr/local/bin/xml ${{targets.destdir}}/usr/bin/ ln -s /usr/bin/xml ${{targets.destdir}}/usr/bin/xmlstarlet + +update: + enabled: true + release-monitor: + identifier: 5201 # https://release-monitoring.org/project/5201/