Trunk Makefile builder #265
Conversation
|
This pull request is automatically being deployed by Amplify Hosting (learn more). |
| @@ -28,7 +28,7 @@ pub struct InstallCommand { | |||
| } | |||
|
|
|||
| #[derive(thiserror::Error, Debug)] | |||
| pub enum PgxInstallError { | |||
| pub enum InstallError { | |||
There was a problem hiding this comment.
In this file we make two changes:
- handle pathed installs
- check for architecture at the level of the whole artifact instead of each file
| @@ -1,36 +1,21 @@ | |||
| use bollard::container::{ | |||
There was a problem hiding this comment.
In the PGX logic, we delete everything that is not reusable and move reusable parts into containers.rs. Then we use the reusable logic that is shared with C builder in this builder.
| @@ -8,7 +8,7 @@ use std::path::{Path, PathBuf}; | |||
| pub enum PackagedFile { | |||
| ControlFile {}, | |||
| SqlFile {}, | |||
| SharedObject { architecture: Option<String> }, | |||
| SharedObject {}, | |||
There was a problem hiding this comment.
we set architecture at the level of the whole package instead of each file
| @@ -1,5 +1,7 @@ | |||
| use super::SubCommand; | |||
| use crate::commands::generic_build::build_generic; | |||
There was a problem hiding this comment.
In this file, we add a new type of build - C build
| @@ -137,17 +127,15 @@ impl SubCommand for InstallCommand { | |||
| tempfile.write_reader(gz)?; | |||
| tempfile.rewind()?; | |||
| let input = tempfile; | |||
| install(input, extension_dir, package_lib_dir, bitcode_dir, sharedir).await?; | |||
| install(input, package_lib_dir, sharedir).await?; | |||
There was a problem hiding this comment.
installation directories are being simplified to just sharedir or pkglibdir instead of each file type. File type still used to determine if it is under sharedir or pkglibdir
sjmiller609
requested review from
ianstanton
and removed request for
ianstanton
| @@ -1,6 +1,6 @@ | |||
| [package] | |||
| name = "pg-trunk" | |||
| version = "0.3.2" | |||
| version = "0.4.0-alpha.1" | |||
There was a problem hiding this comment.
we have to republish packages since they are in a new format, so I don't want it as the default on cargo install for now
* Add sample MessageQueue * Update runtime configs * Add sample OLAP * Add sample OLTP * Add sample MachineLearning * Add sample Standard * Bump crate
Refactored PGX builder to work in same was as C builder. In either case, the following procedure is performed: