Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update varfish-server-worker to 0.17.0 #51197

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
14 changes: 8 additions & 6 deletions recipes/varfish-server-worker/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
{% set version = "0.13.0" %}
{% set version = "0.15.0" %}

package:
name: varfish-server-worker
version: {{ version }}

build:
number: 1
number: 0
skip: True # [osx]
run_exports:
- {{ pin_subpackage("varfish-server-worker", max_pin="x.x") }}

source:
url: https://github.com/varfish-org/varfish-server-worker/archive/refs/tags/v{{ version }}.tar.gz
sha256: 2a593575ae37bd1c9f934e45b378024912108d2391cccba1b9120c4685c2362a
sha256: fda91c251c195cd0b78b60a92deae05ac5622c2fede262481e2502b569a63075

requirements:
build:
- {{ compiler('c') }}
- {{ compiler('cxx') }}
- {{ compiler('rust') }}
- clangdev
- pkg-config
- protobuf
- make
- cmake
host:
- clangdev
- openssl
- sqlite
- zlib
- clangdev
- protobuf
run:
Comment on lines +30 to +31
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

⚠️ Potential issue

Remove duplicate clangdev and keep protobuf dependency

Based on the git history:

  1. The duplicate clangdev was introduced in commit a6e9ded when the recipe was cleaned up, moving dependencies from build to host section.
  2. protobuf is a legitimate dependency that has been present since early versions of the package (visible in the git history) and was similarly moved from build to host section.

Remove the duplicate clangdev entry:

  host:
    - clangdev
    - openssl
    - sqlite
    - zlib
-   - clangdev
    - protobuf

The protobuf dependency should be kept as it's a required component of the package.

🔗 Analysis chain

Review duplicate dependency and new protobuf requirement.

There are two issues in the host requirements:

  1. clangdev is listed twice (lines 25 and 30)
  2. New protobuf dependency has been added

Remove the duplicate clangdev entry:

  host:
    - clangdev
    - openssl
    - sqlite
    - zlib
-   - clangdev
    - protobuf

Let's verify if protobuf is a new dependency in the upstream project:

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check for protobuf-related changes in the upstream repository
# Expected: Find evidence of protobuf usage

# Search for protobuf-related files and imports
rg -l "proto" 
rg -l "protobuf"

Length of output: 294


Script:

#!/bin/bash
# Let's try a different approach to verify protobuf usage:

# 1. Check for .proto files
fd -e proto

# 2. Look for protobuf in any build/dependency files
fd -g "*requirements*.txt" -g "setup.py" -g "pyproject.toml" -g "Cargo.toml" -X cat

# 3. Search for protobuf imports or usage with more specific patterns
rg "from.*proto" 
rg "import.*proto"
rg "use.*proto"

Length of output: 7825


Script:

#!/bin/bash
# Let's check the git history of the meta.yaml file to understand when and why protobuf was added

# Check git history for the specific file
git log -p recipes/varfish-server-worker/meta.yaml

# Also check the upstream repository's requirements
curl -sL https://raw.githubusercontent.com/varfish-org/varfish-server-worker/v0.16.1/Cargo.toml

Length of output: 12740

- sqlite

Expand All @@ -39,8 +39,10 @@ test:
about:
home: https://github.com/varfish-org/varfish-server-worker
license: MIT
license_family: MIT
summary: |
Rust-based tool for the heavy lifting in varfish-server.
"Rust-based tool for the heavy lifting in varfish-server."
dev_url: https://github.com/varfish-org/varfish-server-worker

extra:
additional-platforms:
Expand Down
Loading