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

install: install system dependencies defined in Trunk.toml with an additional flag #934

Merged
merged 9 commits into from
Mar 10, 2025

Conversation

vrmiguel
Copy link
Member

No description provided.

@@ -0,0 +1,102 @@
use std::{
Copy link
Member Author

@vrmiguel vrmiguel Feb 20, 2025

Choose a reason for hiding this comment

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

This file basically duplicates what we did for pgxn-deps. If we publish the pgxn_deps crate, Trunk could use the crate directly and remove this duplication

Copy link
Collaborator

Choose a reason for hiding this comment

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

pgxn-deps might evolve into something, but not in the immediate future. Seems fine to just copy it here.

pub dependencies: Option<HashMap<String, Vec<String>>>,
/// A list of extensions the extension being installed depends on
pub extension_dependencies: Option<Vec<String>>,
Copy link
Member Author

Choose a reason for hiding this comment

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

The comment was tagged on the wrong variable

Copy link

This pull request is automatically being deployed by Amplify Hosting (learn more).

Access this pull request here: https://pr-934.d2qgksbj4k37j8.amplifyapp.com

Copy link
Collaborator

@theory theory left a comment

Choose a reason for hiding this comment

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

Seems reasonable but needs tests.

@vrmiguel vrmiguel force-pushed the tem-3064 branch 6 times, most recently from 862ff76 to 6db1008 Compare March 10, 2025 17:05
@vrmiguel vrmiguel marked this pull request as ready for review March 10, 2025 17:47
@vrmiguel vrmiguel requested a review from ChuckHend as a code owner March 10, 2025 17:47
@@ -59,9 +59,11 @@ which = "4.4.0"
lazy_static = "1.5.0"
fastrand = "2.1.0"
regex = "1.11.1"
mockcmd = { version = "0.0.1" }
Copy link
Collaborator

Choose a reason for hiding this comment

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

Shouldn't this only be a dev dependency?

Copy link
Member Author

Choose a reason for hiding this comment

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

It's both! We also set it under dev-dependencies. In non-dev, however, it's just a rename for std::process::Command

mockcmd = { version = "0.0.1", features = ["test"] }

Comment on lines +606 to +610
let host_arch = if cfg!(test) {
"x86_64"
} else {
std::env::consts::ARCH
};
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why doesn't it work with ARM64?

Copy link
Member Author

Choose a reason for hiding this comment

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

Because Trunk is limited to linux/amd64 at the moment, but we could change that in the future

@vrmiguel vrmiguel merged commit 1c0d8cd into main Mar 10, 2025
4 checks passed
@vrmiguel vrmiguel deleted the tem-3064 branch March 10, 2025 18:34
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.

2 participants