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.

Sign up for GitHub

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

chore(stackctl)!: rename stackable-cli to stackctl #40

Merged
merged 6 commits into from
Jan 15, 2023
Merged

chore(stackctl)!: rename stackable-cli to stackctl #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
36af5b5
chore: rename stackable-cli to stackctl
futursolo Jan 15, 2023
c08157a
ci: rename package
futursolo Jan 15, 2023
ad91cd2
chore: give vendored package a different name
futursolo Jan 15, 2023
293a4f6
ci: fix vendored crate name
futursolo Jan 15, 2023
231d29d
chore: allow multiple templates
futursolo Jan 15, 2023
f6bb9cc
chore: use main for ci
futursolo Jan 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,7 @@ jobs:
- name: Generate Template
run: |
cargo generate --path stackable/templates/fullstack \
--name template-fullstack-generated \
--define stackable_is_main=false \
--define stackable_is_release=false
--name template-fullstack-generated

- name: Add Stackable Crates
run: |
Expand All @@ -96,8 +94,8 @@ jobs:
cargo add -p template-fullstack-generated-view \
--path ../stackable/crates/stackable-bridge

cargo add -p stackctl \
--path ../stackable/crates/stackable-cli
cargo add -p template-fullstack-generated-stackctl \
--path ../stackable/crates/stackctl
working-directory: template-fullstack-generated

- name: Run Lints
Expand All @@ -111,7 +109,10 @@ jobs:
name: Publish Templates
runs-on: ubuntu-latest
if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/'))
needs: check-templates
needs:
- lint
- rustfmt
- check-templates
steps:
- name: Checkout Project
uses: actions/checkout@v3
Expand Down
46 changes: 23 additions & 23 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ci/feature-soundness.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cargo clippy -p stackable-backend --features=cli -- -D warnings

cargo clippy -p stackable-frontend -- -D warnings

cargo clippy -p stackable-cli -- -D warnings
cargo clippy -p stackctl -- -D warnings

cargo clippy -p example-fullstack-client -- -D warnings
cargo clippy -p example-fullstack-server -- -D warnings
2 changes: 1 addition & 1 deletion crates/stackable-cli/Cargo.toml → crates/stackctl/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "stackable-cli"
name = "stackctl"
version = "0.1.0"
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion crates/stackable-cli/src/bin/stackctl.rs → crates/stackctl/src/bin/stackctl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#[tokio::main]
async fn main() -> anyhow::Result<()> {
stackable_cli::main().await
stackctl::main().await
}
0 crates/stackable-cli/src/cli.rs → crates/stackctl/src/cli.rs
View file
Open in desktop
File renamed without changes.
0 crates/stackable-cli/src/env_file.rs → crates/stackctl/src/env_file.rs
View file
Open in desktop
File renamed without changes.
0 crates/stackable-cli/src/indicators.rs → crates/stackctl/src/indicators.rs
View file
Open in desktop
File renamed without changes.
0 crates/stackable-cli/src/lib.rs → crates/stackctl/src/lib.rs
View file
Open in desktop
File renamed without changes.
0 crates/stackable-cli/src/manifest.rs → crates/stackctl/src/manifest.rs
View file
Open in desktop
File renamed without changes.
0 crates/stackable-cli/src/profile.rs → crates/stackctl/src/profile.rs
View file
Open in desktop
File renamed without changes.
0 crates/stackable-cli/src/utils.rs → crates/stackctl/src/utils.rs
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions templates/cargo-generate.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[template]
sub_templates = ["fullstack"]
7 changes: 3 additions & 4 deletions templates/fullstack/crates/stackctl/Cargo.toml.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "stackctl"
name = "{{project-name}}-stackctl"
version = "0.1.0"
edition = "2021"
publish = false
Expand All @@ -12,9 +12,8 @@ anyhow = "1"

{% if stackable_target == "release" %}
# Stackable
stackable-backend = { version = "{{stackable_release_ver}}", features = ["cli"] }
stackable-cli = "{{stackable_release_ver}}"
stackctl = "{{stackable_release_ver}}"
{% elsif stackable_target == "main" %}
# Stackable
stackable-cli = { git = "https://github.com/futursolo/stackable" }
stackctl = { git = "https://github.com/futursolo/stackable" }
{% endif %}
2 changes: 1 addition & 1 deletion ...tes/fullstack/crates/stackctl/src/main.rs → ...stack/crates/stackctl/src/bin/stackctl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// A vendored version of stackctl, this is a workaround until https://github.com/rust-lang/rfcs/pull/3168 is implemented.
#[tokio::main]
async fn main() -> anyhow::Result<()> {
stackable_cli::main().await
stackctl::main().await
}
Empty file added templates/fullstack/crates/stackctl/src/lib.rs
View file
Open in desktop
Empty file.