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

Implements store paths for builds #34

Merged
merged 13 commits into from
Jun 21, 2024

Conversation

erikreinert
Copy link
Member

Changes

  • adds build.environment, build.packages and build.sandbox configuration options for packages

- Update `sync_wrapper` to version `0.1.2` in Cargo.lock
- Update `httparse` to version `1.9.4` in Cargo.lock
- Add `hyper-rustls` version `0.27.2` to Cargo.lock
- Update `spin` to version `0.5.2` in Cargo.lock
- Update `miniz_oxide` to version `0.7.4` in Cargo.lock
- Update `reqwest` to version `0.12.5` in Cargo.lock
- Add `ring` version `0.17.8` to Cargo.lock
- Add `rustls` version `0.23.10` to Cargo.lock
- Add `rustls-webpki` version `0.102.4` to Cargo.lock
- Add `spin` version `0.9.8` to Cargo.lock
- Add `sync_wrapper` version `1.0.1` to Cargo.lock
- Add `tokio-rustls` version `0.26.0` to Cargo.lock
- Add `untrusted` version `0.9.0` to Cargo.lock
- Update `zstd-sys` to version `2.0.11+zstd.1.5.6` in Cargo.lock
- Update `cargoSha256` in flake.nix to `sha256-kDe3EEc2InW39X+VXyUUwNYPY+mlUh5A3KOpc3ITqNc=`
…ldRequest

- Updated `config.proto` to include `environment` map in `ConfigPackageBuild`.
- Updated `package.proto` to include `build_environment` map in `PackageBuildRequest`.

feat(clean): add clean-cache target to justfile

- Added `clean-cache` target to `justfile` to remove store cache.

refactor(agent): update build package handling in ConfigService

- Modified `ConfigService` implementation to handle `build_environment` and populate `build_packages`.

refactor(worker): enhance logging and environment handling in PackageService

- Updated `PackageService` to log sandbox paths and build packages.
- Added handling for `build_environment` in sandbox command.
- Added `sandbox` field to `ConfigPackageBuild` message in `config.proto`.
- Added `build_sandbox` field to `PackageBuildRequest` message in `package.proto`.
- Updated `PackagePrepareResponse` and `PackageBuildResponse` messages to use `log_output` as the first field.

refactor(service): enhance package handling and sandbox execution

- Updated `service.rs` to handle new `sandbox` and `build_sandbox` fields.
- Improved package output handling by including `ConfigPackageOutput` in responses.
- Enhanced sandbox execution by adding support for Gzip and Xz decoders.
- Refined environment variable handling for sandbox execution.

fix(worker): correct source hash mismatch error message

- Updated error message for source hash mismatch in `service.rs`.

refactor(archives): improve tar archive handling

- Replaced `Archive` with `ArchiveBuilder` for better control over tar archive extraction.
- Removed unnecessary logging in `compress_tar_gz` function.
@erikreinert erikreinert self-assigned this Jun 21, 2024
The cargoSha256 hash for the vorpal package has been updated to ensure the integrity and correctness of the build process.
- Refactored `source_prepare` function to use a temporary source path for unpacking archives and copying files.
- Added `source_hash` parameter to `source_prepare` function.
- Moved `copy_files` function from `service/worker/service.rs` to `store/paths.rs`.
- Updated imports in `service/worker/service.rs` to use consolidated imports.
- Updated calls to `copy_files` to use the new location in `paths.rs`.
- Improved logging messages for better clarity during source preparation and file operations.
Removed unnecessary references in the function calls to `get_package_source_path` and `compress_tar_gz` to align with the expected parameter types. This change improves code readability and correctness.
- Remove flake-utils and systems dependencies
- Update nixpkgs to revision d603719ec6e294f034936c0d0dc06f689d91b6c3
- Update rust-overlay to revision c9a793a5278f711a59fe77b9bf54b215667022c6
@erikreinert erikreinert merged commit 51ec435 into main Jun 21, 2024
4 checks passed
@erikreinert erikreinert deleted the feature/19-dependency-binaries-in-sandbox branch June 21, 2024 22:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant