Skip to content

Commit 6458502

Browse files
authored
Merge pull request #1161 from michaeltlombardi/gh-1152/main/rust-workspace
(GH-1152, GH-1153) Define cargo workspace and reorganize projects
2 parents f7e9bcf + d2afbc5 commit 6458502

File tree

252 files changed

+3605
-13840
lines changed

Some content is hidden

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

252 files changed

+3605
-13840
lines changed

.github/workflows/rust.new.yml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: RustNew
2+
3+
on:
4+
push:
5+
branches: [ "main", "release/*" ]
6+
pull_request:
7+
branches: [ "main", "release/*" ]
8+
paths-ignore:
9+
- "docs/**"
10+
- "*.md"
11+
- ".vscode/*.json"
12+
- ".github/ISSUE_TEMPLATE/**"
13+
14+
env:
15+
CARGO_TERM_COLOR: always
16+
17+
jobs:
18+
build-linux-new:
19+
runs-on: ubuntu-latest
20+
steps:
21+
- uses: actions/checkout@v5
22+
- name: Install prerequisites
23+
shell: pwsh
24+
run: ./build.new.ps1 -SkipBuild -Clippy -Verbose
25+
- name: Build
26+
shell: pwsh
27+
run: ./build.new.ps1 -Clippy -Verbose
28+
- name: Run tests
29+
shell: pwsh
30+
run: ./build.new.ps1 -Test -Verbose
31+
32+
build-windows-new:
33+
runs-on: windows-latest
34+
steps:
35+
- uses: actions/checkout@v5
36+
- name: Install prerequisites
37+
shell: pwsh
38+
run: ./build.new.ps1 -SkipBuild -Clippy -Verbose
39+
- name: Build
40+
shell: pwsh
41+
run: ./build.new.ps1 -Clippy -Verbose
42+
- name: Run tests
43+
shell: pwsh
44+
run: ./build.new.ps1 -Test -Verbose
45+
46+
build-macos-new:
47+
runs-on: macos-latest
48+
steps:
49+
- uses: actions/checkout@v5
50+
- name: Install prerequisites
51+
shell: pwsh
52+
run: ./build.new.ps1 -SkipBuild -Clippy -Verbose
53+
- name: Build
54+
shell: pwsh
55+
run: ./build.new.ps1 -Clippy -Verbose
56+
- name: Run tests
57+
shell: pwsh
58+
run: ./build.new.ps1 -Test -Verbose

.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ bin/
66
# Node.js generated files for tree-sitter
77
build/
88
node_modules/
9-
tree-sitter-dscexpression/bindings/
10-
tree-sitter-dscexpression/src/
11-
tree-sitter-dscexpression/parser.*
9+
grammars/**/bindings/
10+
grammars/**/src/
11+
grammars/**/parser.*

.vscode/settings.json

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,4 @@
11
{
2-
"rust-analyzer.linkedProjects": [
3-
"./dsc/Cargo.toml",
4-
"./dsc_lib/Cargo.toml",
5-
"./dscecho/Cargo.toml",
6-
"./osinfo/Cargo.toml",
7-
"./registry/Cargo.toml",
8-
"./runcommandonset/Cargo.toml",
9-
"./tools/test_group_resource/Cargo.toml",
10-
"./tools/dsctest/Cargo.toml",
11-
"./tree-sitter-dscexpression/Cargo.toml",
12-
"./y2j/Cargo.toml"
13-
],
142
"rust-analyzer.showUnlinkedFileNotification": true,
153
"json.schemas": [
164
{

0 commit comments

Comments
 (0)