chore: move release_plz into workflow

tailcallhq · Nov 11, 2024 · ac76d84 · ac76d84
1 parent 34f9302
commit ac76d84
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/workspace/gh-workflow-gen/Cargo.toml b/workspace/gh-workflow-gen/Cargo.toml
@@ -7,4 +7,3 @@ publish = false
 [build-dependencies]
 
 gh-workflow = { path = "../gh-workflow" }
-gh-workflow-release-plz = { path = "../gh-workflow-release-plz" }
diff --git a/workspace/gh-workflow-gen/build.rs b/workspace/gh-workflow-gen/build.rs
@@ -1,5 +1,5 @@
 use gh_workflow::*;
-use gh_workflow_release_plz::ReleasePlz;
+use release_plz::Release;
 use toolchain::Toolchain;
 
 fn main() {
@@ -51,7 +51,7 @@ fn main() {
         .needs("build")
         .permissions(permissions)
         .add_step(Step::checkout())
-        .add_step(ReleasePlz::default());
+        .add_step(Release::default());
 
     Workflow::new("Build and Test")
         .add_env(flags)

diff --git a/workspace/gh-workflow-release-plz/Cargo.toml b/workspace/gh-workflow-release-plz/Cargo.toml
diff --git a/workspace/gh-workflow-release-plz/src/lib.rs b/workspace/gh-workflow-release-plz/src/lib.rs
diff --git a/workspace/gh-workflow/src/lib.rs b/workspace/gh-workflow/src/lib.rs
@@ -2,6 +2,7 @@ mod cargo;
 pub mod error;
 mod event;
 pub mod generate;
+pub mod release_plz;
 mod rust_flag;
 pub mod toolchain;
 pub(crate) mod workflow;

diff --git a/...ce/gh-workflow-release-plz/src/release.rs → workspace/gh-workflow/src/release_plz.rs b/...ce/gh-workflow-release-plz/src/release.rs → workspace/gh-workflow/src/release_plz.rs
@@ -1,9 +1,10 @@
 use derive_setters::Setters;
-use gh_workflow::{Step, Use};
+
+use crate::{Step, Use};
 
 #[derive(Clone, Default, Setters)]
 #[setters(strip_option, into)]
-pub struct ReleasePlz {
+pub struct Release {
     /// The release-plz command to run. Accepted values: release-pr, release.
     /// (By default it runs both commands).
     pub command: Option<Command>,
@@ -68,8 +69,8 @@ impl std::fmt::Display for Backend {
     }
 }
 
-impl From<ReleasePlz> for Step<Use> {
-    fn from(value: ReleasePlz) -> Self {
+impl From<Release> for Step<Use> {
+    fn from(value: Release) -> Self {
         let mut step = Step::uses("MarcoIeni", "release-plz-action", "0.5").name("Release Plz");
 
         if let Some(command) = value.command {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,3 @@ publish = false
		[build-dependencies]

		gh-workflow = { path = "../gh-workflow" }
		gh-workflow-release-plz = { path = "../gh-workflow-release-plz" }