Skip to content

Commit

Permalink
chore: update prettyplease and add as git submodule (#119)
Browse files Browse the repository at this point in the history
* chore: update prettyplease and add as git submodule

* checkout submodules
  • Loading branch information
bram209 authored May 24, 2024
1 parent ade97c7 commit d96ff25
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 26 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Generate changelog
on:
push:
branches:
- main
- main

jobs:
changelog:
Expand All @@ -30,5 +30,5 @@ jobs:
with:
committer_name: GitHub Actions
committer_email: [email protected]
message: '[skip ci] Update CHANGELOG.md'
default_author: user_info
message: "[skip ci] Update CHANGELOG.md"
default_author: user_info
10 changes: 9 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
paths:
- '**.rs'
- "**.rs"

name: Continuous integration

Expand All @@ -11,6 +11,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
submodules: "true"
- uses: actions-rs/toolchain@v1
with:
profile: minimal
Expand All @@ -25,6 +27,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
submodules: "true"
- uses: actions-rs/toolchain@v1
with:
profile: minimal
Expand All @@ -39,6 +43,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
submodules: "true"
- uses: actions-rs/toolchain@v1
with:
profile: minimal
Expand All @@ -55,6 +61,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
submodules: "true"
- uses: actions-rs/toolchain@v1
with:
profile: minimal
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/post-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v3
with:
submodules: "true"
fetch-depth: 1
- uses: actions/setup-python@v4
with:
Expand Down Expand Up @@ -71,6 +72,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v3
with:
submodules: "true"
fetch-depth: 1
- name: Install packages (Ubuntu)
if: matrix.os == 'ubuntu-20.04'
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/security-audit.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
name: Security audit
on:
push:
paths:
- '**/Cargo.toml'
- '**/Cargo.lock'
paths:
- "**/Cargo.toml"
- "**/Cargo.lock"
jobs:
security_audit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
with:
submodules: "true"
- uses: actions-rs/audit-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "prettyplease"]
path = prettyplease
url = https://github.com/bram209/prettyplease.git
34 changes: 17 additions & 17 deletions Cargo.lock

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

5 changes: 4 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
[workspace]
members = ["printer", "cli", "formatter"]
members = ["printer", "cli", "formatter", "prettyplease"]
resolver = "2"

[workspace.package]
version = "0.1.18"
license = "MIT OR Apache-2.0"

[workspace.dependencies]
leptosfmt-prettyplease = { path = "./prettyplease", version = "0.2.20", features = [
"verbatim",
] }
leptosfmt-formatter = { path = "./formatter", version = "0.1.18" }
leptosfmt-pretty-printer = { version = "0.1.8" }

Expand Down
2 changes: 1 addition & 1 deletion formatter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ description = "view macro formatter for the Leptos web framework"

[dependencies]
leptosfmt-pretty-printer.workspace = true
leptosfmt-prettyplease.workspace = true
rstml = "0.11.2"
syn = { version = "2.0.18", features = ["visit", "full", "extra-traits"] }
leptosfmt-prettyplease = { features = ["verbatim"], version = "0.2.16" }
proc-macro2 = { version = "1.0.68", features = ["span-locations"] }
thiserror = "1.0.40"
crop = "0.3.0"
Expand Down
1 change: 1 addition & 0 deletions prettyplease
Submodule prettyplease added at b62ee4

0 comments on commit d96ff25

Please sign in to comment.