Skip to content

Commit 88f64ca

Browse files
ilyagrilyagr
committed
demo of asking dprint to run Prettier 
1 parent 21e08b7 commit 88f64ca

43 files changed

Lines changed: 1937 additions & 1988 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
22
name: Bug report
33
about: Create a report to help us improve
4-
title: ''
5-
labels: ''
6-
assignees: ''
7-
4+
title: ""
5+
labels: ""
6+
assignees: ""
87
---
98

109
## Description
@@ -13,7 +12,6 @@ assignees: ''
1312
For questions, use https://github.com/martinvonz/jj/discussions/new instead.
1413
Feel free to remove any of the sections below if they don't seem useful. -->
1514

16-
1715
## Steps to Reproduce the Problem
1816

1917
1.
@@ -22,10 +20,8 @@ Feel free to remove any of the sections below if they don't seem useful. -->
2220

2321
## Expected Behavior
2422

25-
2623
## Actual Behavior
2724

28-
2925
## Specifications
3026

3127
- Platform:

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
22
name: Feature request
33
about: Suggest an idea for this project
4-
title: 'FR: '
5-
labels: ''
6-
assignees: ''
7-
4+
title: "FR: "
5+
labels: ""
6+
assignees: ""
87
---
98

109
**Is your feature request related to a problem? Please describe.**

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Note that you need to sign Google's CLA to contribute.
1212
# Checklist
1313

1414
If applicable:
15+
1516
- [ ] I have updated `CHANGELOG.md`
1617
- [ ] I have updated the documentation (README.md, docs/, demos/)
1718
- [ ] I have updated the config schema (cli/src/config-schema.json)

‎.github/dependabot.yml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
version: 2
22
updates:
3-
- package-ecosystem: "cargo"
4-
directory: "/"
5-
schedule:
6-
interval: "daily"
7-
open-pull-requests-limit: 10
8-
commit-message:
9-
prefix: "cargo:"
10-
groups:
11-
cargo-dependencies:
12-
patterns:
13-
- "*"
14-
- package-ecosystem: "github-actions"
15-
directory: "/"
16-
schedule:
17-
interval: "daily"
18-
open-pull-requests-limit: 10
19-
commit-message:
20-
prefix: "github:"
21-
groups:
22-
github-dependencies:
23-
patterns:
24-
- "*"
3+
- package-ecosystem: "cargo"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"
7+
open-pull-requests-limit: 10
8+
commit-message:
9+
prefix: "cargo:"
10+
groups:
11+
cargo-dependencies:
12+
patterns:
13+
- "*"
14+
- package-ecosystem: "github-actions"
15+
directory: "/"
16+
schedule:
17+
interval: "daily"
18+
open-pull-requests-limit: 10
19+
commit-message:
20+
prefix: "github:"
21+
groups:
22+
github-dependencies:
23+
patterns:
24+
- "*"

‎.github/workflows/build.yml‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
os: [ubuntu-latest, macos-14, windows-latest]
2121
cargo_flags: [""]
2222
include:
23-
- os: ubuntu-latest
24-
cargo_flags: "--all-features"
23+
- os: ubuntu-latest
24+
cargo_flags: "--all-features"
2525
runs-on: ${{ matrix.os }}
2626

2727
# TODO FIXME (aseipp): keep the timeout limit to ~15 minutes. this is long
@@ -37,44 +37,44 @@ jobs:
3737
timeout-minutes: 15
3838

3939
steps:
40-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
40+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
4141

42-
# The default version of gpg installed on the runners is a version baked in with git
43-
# which only contains the components needed by git and doesn't work for our test cases.
44-
#
45-
# This installs the latest gpg4win version, which is a variation of GnuPG built for
46-
# Windows.
47-
#
48-
# There is some issue with windows PATH max length which is what all the PATH wrangling
49-
# below is for. Please see the below link for where this fix was derived from:
50-
# https://github.com/orgs/community/discussions/24933
51-
- name: Setup GnuPG [windows]
52-
if: ${{ matrix.os == 'windows-latest' }}
53-
run: |
54-
$env:PATH = "C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\chocolatey\bin"
55-
[Environment]::SetEnvironmentVariable("Path", $env:PATH, "Machine")
56-
choco install --yes gpg4win
57-
echo "C:\Program Files (x86)\Gpg4win\..\GnuPG\bin" >> $env:GITHUB_PATH
58-
59-
# The default version of openssh on windows server is quite old (8.1) and doesn't have
60-
# all the necessary signing/verification commands available (such as -Y find-principals)
61-
- name: Setup ssh-agent [windows]
62-
if: ${{ matrix.os == 'windows-latest' }}
63-
run: |
64-
Remove-WindowsCapability -Online -Name OpenSSH.Server~~~~0.0.1.0
65-
Remove-WindowsCapability -Online -Name OpenSSH.Client~~~~0.0.1.0
66-
choco install openssh --pre
67-
68-
- name: Install Rust
69-
uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8
70-
with:
71-
toolchain: 1.76
72-
- name: Build
73-
run: cargo build --workspace --all-targets --verbose ${{ matrix.cargo_flags }}
74-
- name: Test
75-
run: cargo test --workspace --all-targets --verbose ${{ matrix.cargo_flags }}
76-
env:
77-
RUST_BACKTRACE: 1
42+
# The default version of gpg installed on the runners is a version baked in with git
43+
# which only contains the components needed by git and doesn't work for our test cases.
44+
#
45+
# This installs the latest gpg4win version, which is a variation of GnuPG built for
46+
# Windows.
47+
#
48+
# There is some issue with windows PATH max length which is what all the PATH wrangling
49+
# below is for. Please see the below link for where this fix was derived from:
50+
# https://github.com/orgs/community/discussions/24933
51+
- name: Setup GnuPG [windows]
52+
if: ${{ matrix.os == 'windows-latest' }}
53+
run: |
54+
$env:PATH = "C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\chocolatey\bin"
55+
[Environment]::SetEnvironmentVariable("Path", $env:PATH, "Machine")
56+
choco install --yes gpg4win
57+
echo "C:\Program Files (x86)\Gpg4win\..\GnuPG\bin" >> $env:GITHUB_PATH
58+
59+
# The default version of openssh on windows server is quite old (8.1) and doesn't have
60+
# all the necessary signing/verification commands available (such as -Y find-principals)
61+
- name: Setup ssh-agent [windows]
62+
if: ${{ matrix.os == 'windows-latest' }}
63+
run: |
64+
Remove-WindowsCapability -Online -Name OpenSSH.Server~~~~0.0.1.0
65+
Remove-WindowsCapability -Online -Name OpenSSH.Client~~~~0.0.1.0
66+
choco install openssh --pre
67+
68+
- name: Install Rust
69+
uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8
70+
with:
71+
toolchain: 1.76
72+
- name: Build
73+
run: cargo build --workspace --all-targets --verbose ${{ matrix.cargo_flags }}
74+
- name: Test
75+
run: cargo test --workspace --all-targets --verbose ${{ matrix.cargo_flags }}
76+
env:
77+
RUST_BACKTRACE: 1
7878

7979
check-protos:
8080
name: Check protos
@@ -114,7 +114,7 @@ jobs:
114114
with:
115115
poetry-version: latest
116116
- name: Install dependencies
117-
run: poetry install
117+
run: poetry install
118118
- name: Check that `mkdocs` can build the docs
119119
run: poetry run -- mkdocs build --strict
120120

@@ -137,7 +137,7 @@ jobs:
137137
# pipx install 'poetry<1.4' --suffix -1.3
138138
poetry-version: 1.8
139139
- name: Install dependencies
140-
run: poetry install
140+
run: poetry install
141141
- name: Check that `mkdocs` can build the docs
142142
run: poetry run -- mkdocs build --strict
143143

@@ -153,10 +153,10 @@ jobs:
153153
continue-on-error: ${{ matrix.checks == 'advisories' }}
154154

155155
steps:
156-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
157-
- uses: EmbarkStudios/cargo-deny-action@3f4a782664881cf5725d0ffd23969fcce89fd868
158-
with:
159-
command: check ${{ matrix.checks }}
156+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
157+
- uses: EmbarkStudios/cargo-deny-action@3f4a782664881cf5725d0ffd23969fcce89fd868
158+
with:
159+
command: check ${{ matrix.checks }}
160160

161161
clippy-check:
162162
name: Clippy check

‎.github/workflows/dependabot.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ permissions: read-all
77

88
jobs:
99
dependabot-auto-merge:
10-
name: 'Dependabot auto-merge'
10+
name: "Dependabot auto-merge"
1111
permissions:
1212
contents: write
1313
pull-requests: write
1414
runs-on: ubuntu-latest
1515
if: ${{ github.actor == 'dependabot[bot]' }}
1616
steps:
17-
- name: Enable auto-merge for Dependabot PRs
18-
run: gh pr merge --auto --rebase "$PR_URL"
19-
env:
20-
PR_URL: ${{github.event.pull_request.html_url}}
21-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
17+
- name: Enable auto-merge for Dependabot PRs
18+
run: gh pr merge --auto --rebase "$PR_URL"
19+
env:
20+
PR_URL: ${{github.event.pull_request.html_url}}
21+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
20-
- run: "git fetch origin gh-pages --depth=1"
20+
- run: "git fetch origin gh-pages --depth=1"
2121
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d
2222
with:
2323
python-version: 3.11

0 commit comments

Comments
 (0)