Compare commits

..

4 Commits

9 changed files with 181 additions and 37 deletions

View File

@ -16,6 +16,10 @@ jobs:
changelog: CHANGELOG.md changelog: CHANGELOG.md
# (Optional) Create a draft release. # (Optional) Create a draft release.
# [default value: false] # [default value: false]
draft: true draft: false
# (Required) GitHub token for creating GitHub Releases. # (Required) GitHub token for creating GitHub Releases.
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
- name: Update rust toolchain
run: rustup update stable && rustup default stable
- name: Run dagger [RELEASE]
run: cargo run -p ci -- release --version="${{github.ref_name}}"

View File

@ -6,3 +6,77 @@ core.
## 0.2.6 - 2023-02-17 ## 0.2.6 - 2023-02-17
With releaser With releaser
## v0.2.6 (2023-02-17)
## v0.2.5 (2023-02-17)
## v0.2.4 (2023-02-17)
## v0.2.3 (2023-02-17)
## v0.2.2 (2023-02-17)
## v0.2.1 (2023-02-18)
### New Features
- <csr-id-68af1696f7d6bd8f9f2169075c554938e2d594ba/> color-eyre
### Commit Statistics
<csr-read-only-do-not-edit/>
- 1 commit contributed to the release.
- 1 commit was understood as [conventional](https://www.conventionalcommits.org).
- 0 issues like '(#ID)' were seen in commit messages
### Commit Details
<csr-read-only-do-not-edit/>
<details><summary>view details</summary>
* **Uncategorized**
- color-eyre ([`68af169`](https://github.com/kjuulh/dagger-rs/commit/68af1696f7d6bd8f9f2169075c554938e2d594ba))
</details>
## v0.2.0 (2023-02-17)
### Commit Statistics
<csr-read-only-do-not-edit/>
- 19 commits contributed to the release over the course of 21 calendar days.
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
- 1 unique issue was worked on: [#6](https://github.com/kjuulh/dagger-rs/issues/6)
### Commit Details
<csr-read-only-do-not-edit/>
<details><summary>view details</summary>
* **[#6](https://github.com/kjuulh/dagger-rs/issues/6)**
- feature/add impl ([`4a4c03f`](https://github.com/kjuulh/dagger-rs/commit/4a4c03f3c2ee7f6268c65976715e70767b4ea78d))
* **Uncategorized**
- move code to dagger-core ([`ec0d0b2`](https://github.com/kjuulh/dagger-rs/commit/ec0d0b22e646c97acb3ce93f3afb3ddb8590e68f))
- add fields ([`496a687`](https://github.com/kjuulh/dagger-rs/commit/496a687bc34f7c58cc86df60c183be741b0b8a9c))
- with codegen output ([`0bf6b0e`](https://github.com/kjuulh/dagger-rs/commit/0bf6b0e91ecc31c1f6b51338234137eb185810a0))
- added scalars ([`e587414`](https://github.com/kjuulh/dagger-rs/commit/e5874141b3b6256b7ac2a0bf653089fa7bcc5d14))
- split out codegen parts ([`3263f1d`](https://github.com/kjuulh/dagger-rs/commit/3263f1d589aee78065401c666533cb0cbadd06ce))
- add collection of types ([`7433453`](https://github.com/kjuulh/dagger-rs/commit/7433453c6dd1447f8ad09c06c13a02cfac5ace05))
- with type filtering ([`2eb5d98`](https://github.com/kjuulh/dagger-rs/commit/2eb5d98c8a28ab8dfdc4eb959809191bc483bd08))
- with fixes ([`3eb8914`](https://github.com/kjuulh/dagger-rs/commit/3eb891422fa1404f88cfe259bddbb67e2843f1d3))
- add todo for not dropping proc ([`b63c44a`](https://github.com/kjuulh/dagger-rs/commit/b63c44adedfa0c8ef4899198bea75a5744570a87))
- can get schema ([`06fd730`](https://github.com/kjuulh/dagger-rs/commit/06fd730a1c23af88eaffa1dde8acdea202247f91))
- with session ([`83ecbd2`](https://github.com/kjuulh/dagger-rs/commit/83ecbd238ab87396c9645cb93741e89a34c92766))
- with engine ([`ee655d0`](https://github.com/kjuulh/dagger-rs/commit/ee655d02ef9670b2c0cbaa600c3e2af9f54dbf65))
- Can download dagger ([`1e88bb3`](https://github.com/kjuulh/dagger-rs/commit/1e88bb327035bd156588716202b8d982a50c114c))
- with out keeper ([`59e59fd`](https://github.com/kjuulh/dagger-rs/commit/59e59fd55d17f7e24ccb3c64471bf82332af5a21))
- more allow dead_code ([`a804dd9`](https://github.com/kjuulh/dagger-rs/commit/a804dd97a6ed08ad51c8552bc5d4c845491dca1c))
- allow dead_code ([`e2d32ed`](https://github.com/kjuulh/dagger-rs/commit/e2d32ede7621123a3db9d5e2cd3e7d276d0b5e2f))
- without integration ([`b6186aa`](https://github.com/kjuulh/dagger-rs/commit/b6186aa9015f8ddb5d59d1346a2cdc935a26d061))
- Add base sdk ([`078e2d9`](https://github.com/kjuulh/dagger-rs/commit/078e2d9c2c43fc2b4752ab1dcf4627c840009992))
</details>

59
Cargo.lock generated
View File

@ -245,10 +245,10 @@ dependencies = [
[[package]] [[package]]
name = "dagger-codegen" name = "dagger-codegen"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"convert_case", "convert_case",
"dagger-core 0.2.0", "dagger-core 0.2.1",
"eyre", "eyre",
"genco", "genco",
"itertools", "itertools",
@ -257,28 +257,6 @@ dependencies = [
"serde_json", "serde_json",
] ]
[[package]]
name = "dagger-core"
version = "0.2.0"
dependencies = [
"clap",
"dirs",
"eyre",
"flate2",
"genco",
"graphql-introspection-query",
"graphql_client",
"hex",
"hex-literal",
"platform-info",
"reqwest",
"serde",
"serde_json",
"sha2",
"tar",
"tempfile",
]
[[package]] [[package]]
name = "dagger-core" name = "dagger-core"
version = "0.2.0" version = "0.2.0"
@ -304,12 +282,35 @@ dependencies = [
] ]
[[package]] [[package]]
name = "dagger-rs" name = "dagger-core"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"clap", "clap",
"dirs",
"eyre",
"flate2",
"genco",
"graphql-introspection-query",
"graphql_client",
"hex",
"hex-literal",
"platform-info",
"reqwest",
"serde",
"serde_json",
"sha2",
"tar",
"tempfile",
]
[[package]]
name = "dagger-rs"
version = "0.2.1"
dependencies = [
"clap",
"color-eyre",
"dagger-codegen", "dagger-codegen",
"dagger-core 0.2.0", "dagger-core 0.2.1",
"dirs", "dirs",
"eyre", "eyre",
"flate2", "flate2",
@ -332,7 +333,7 @@ name = "dagger-sdk"
version = "0.2.0" version = "0.2.0"
dependencies = [ dependencies = [
"base64", "base64",
"dagger-core 0.2.0", "dagger-core 0.2.1",
"eyre", "eyre",
"futures", "futures",
"genco", "genco",
@ -351,7 +352,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e454c49b81feeb5c4057f54223cb8d7618e5d015ed835c3f3fa231fefa04e833" checksum = "e454c49b81feeb5c4057f54223cb8d7618e5d015ed835c3f3fa231fefa04e833"
dependencies = [ dependencies = [
"base64", "base64",
"dagger-core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "dagger-core 0.2.0",
"eyre", "eyre",
"futures", "futures",
"genco", "genco",

View File

@ -1,6 +1,6 @@
[package] [package]
name = "dagger-rs" name = "dagger-rs"
version = "0.2.0" version = "0.2.1"
edition = "2021" edition = "2021"
readme = "README.md" readme = "README.md"
license-file = "LICENSE.MIT" license-file = "LICENSE.MIT"
@ -19,8 +19,8 @@ members = [
] ]
[dependencies] [dependencies]
dagger-codegen = { path = "crates/dagger-codegen", version = "0.2.0" } dagger-codegen = { path = "crates/dagger-codegen", version = "^0.2.1" }
dagger-core = { path = "crates/dagger-core", version = "0.2.0" } dagger-core = { path = "crates/dagger-core", version = "^0.2.1" }
clap = "4.1.6" clap = "4.1.6"
dirs = "4.0.0" dirs = "4.0.0"
@ -41,3 +41,4 @@ serde_json = "1.0.93"
sha2 = "0.10.6" sha2 = "0.10.6"
tar = "0.4.38" tar = "0.4.38"
tempfile = "3.3.0" tempfile = "3.3.0"
color-eyre = "0.6.2"

View File

@ -8,6 +8,10 @@ fn main() -> eyre::Result<()> {
let matches = clap::Command::new("ci") let matches = clap::Command::new("ci")
.subcommand_required(true) .subcommand_required(true)
.subcommand(clap::Command::new("pr")) .subcommand(clap::Command::new("pr"))
.subcommand(
clap::Command::new("release")
.arg(clap::Arg::new("version").long("version").required(true)),
)
.get_matches(); .get_matches();
let client = dagger_sdk::client::connect()?; let client = dagger_sdk::client::connect()?;
@ -16,6 +20,7 @@ fn main() -> eyre::Result<()> {
match matches.subcommand() { match matches.subcommand() {
Some(("pr", _)) => return validate_pr(client, base), Some(("pr", _)) => return validate_pr(client, base),
Some(("release", subm)) => return release(client, base, subm),
Some(_) => { Some(_) => {
panic!("invalid subcommand selected!") panic!("invalid subcommand selected!")
} }
@ -25,6 +30,63 @@ fn main() -> eyre::Result<()> {
} }
} }
fn release(
client: Arc<Query>,
base: Container,
subm: &clap::ArgMatches,
) -> Result<(), color_eyre::Report> {
let version = subm.get_one::<String>("version").unwrap();
let container = base
.with_exec(
vec!["cargo".into(), "install".into(), "cargo-release".into()],
None,
)
.with_exec(
vec![
"cargo".into(),
"release".into(),
"version".into(),
"--workspace".into(),
"--execute".into(),
"--no-confirm".into(),
version.clone(),
],
None,
)
.with_exec(
vec![
"cargo".into(),
"release".into(),
"replace".into(),
"--workspace".into(),
"--execute".into(),
"--no-confirm".into(),
],
None,
)
.with_exec(
vec![
"cargo".into(),
"release".into(),
"publish".into(),
"--workspace".into(),
"--execute".into(),
"--no-verify".into(),
"--no-confirm".into(),
],
None,
);
let exit = container.exit_code();
if exit != 0 {
eyre::bail!("container failed with non-zero exit code");
}
println!("validating pr succeeded!");
Ok(())
}
fn get_dependencies(client: Arc<Query>) -> Container { fn get_dependencies(client: Arc<Query>) -> Container {
let cargo_dir = client.host().directory( let cargo_dir = client.host().directory(
".".into(), ".".into(),

View File

@ -1,6 +1,6 @@
[package] [package]
name = "dagger-codegen" name = "dagger-codegen"
version = "0.2.0" version = "0.2.1"
edition = "2021" edition = "2021"
readme = "README.md" readme = "README.md"
license-file = "LICENSE.MIT" license-file = "LICENSE.MIT"
@ -11,7 +11,7 @@ publish = true
[dependencies] [dependencies]
convert_case = "0.6.0" convert_case = "0.6.0"
dagger-core = { path = "../dagger-core", version = "0.2.0" } dagger-core = { path = "../dagger-core", version = "^0.2.1" }
eyre = "0.6.8" eyre = "0.6.8"
genco = "0.17.3" genco = "0.17.3"

View File

@ -1,6 +1,6 @@
[package] [package]
name = "dagger-core" name = "dagger-core"
version = "0.2.0" version = "0.2.1"
edition = "2021" edition = "2021"
readme = "README.md" readme = "README.md"
license-file = "LICENSE.MIT" license-file = "LICENSE.MIT"

View File

@ -12,7 +12,7 @@ publish = true
[dependencies] [dependencies]
base64 = "0.21.0" base64 = "0.21.0"
dagger-core = { path = "../dagger-core", version = "0.2.0" } dagger-core = { path = "../dagger-core", version = "^0.2.1" }
eyre = "0.6.8" eyre = "0.6.8"
futures = "0.3.26" futures = "0.3.26"

View File

@ -4,6 +4,8 @@ pub mod cli;
mod cli_generate; mod cli_generate;
fn main() -> eyre::Result<()> { fn main() -> eyre::Result<()> {
color_eyre::install().unwrap();
let args = std::env::args(); let args = std::env::args();
let args = args.collect::<Vec<String>>(); let args = args.collect::<Vec<String>>();
let args = args.iter().map(|s| s.as_str()).collect::<Vec<&str>>(); let args = args.iter().map(|s| s.as_str()).collect::<Vec<&str>>();