Set up CI for compiler (#8)

- Fix typos in CI yaml - Due to actions-rs/cargo#86 the cargo actions cannot be configured to run in the `compiler/` dir, so it's easier to just move the compiler into the root of the repo.
KittyCAD · Jul 18, 2023 · d00b290 · d00b290
1 parent 55609db
commit d00b290
Show file tree

Hide file tree

Showing 15 changed files with 83 additions and 85 deletions.
diff --git a/compiler/.github/codecov.yml → .github/codecov.yml b/compiler/.github/codecov.yml → .github/codecov.yml
diff --git a/compiler/.github/workflows/cargo-clippy.yml → .github/workflows/cargo-clippy.yml b/compiler/.github/workflows/cargo-clippy.yml → .github/workflows/cargo-clippy.yml
@@ -3,23 +3,21 @@ on:
     branches:
       - main
     paths:
-      - '**.rs'
-      - .github/workflows/cargo-clippy.yml
-      - Cargo.lock
-      - Cargo.toml
-      - rust-toolchain
-      - rust-toolchain.toml
+      - 'compiler/**.rs'
+      - compiler/.github/workflows/cargo-clippy.yml
+      - compiler/Cargo.lock
+      - compiler/Cargo.toml
+      - compiler/rust-toolchain.toml
   pull_request:
     paths:
-      - '**.rs'
-      - .github/workflows/cargo-clippy.yml
-      - Cargo.lock
-      - Cargo.toml
-      - rust-toolchain
-      - rust-toolchain.toml
+      - 'compiler/**.rs'
+      - compiler/.github/workflows/cargo-clippy.yml
+      - compiler/Cargo.lock
+      - compiler/Cargo.toml
+      - compiler/rust-toolchain.toml
 name: cargo clippy
 jobs:
-  cargoclippy:
+  compiler-cargoclippy:
     name: cargo clippy --tests --benches --examples
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/cargo-deny.yml b/.github/workflows/cargo-deny.yml
@@ -0,0 +1,32 @@
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'compiler/**.rs'
+      - compiler/.github/workflows/cargo-deny.yml
+      - compiler/Cargo.lock
+      - compiler/Cargo.toml
+      - compiler/rust-toolchain.toml
+  pull_request:
+    paths:
+      - 'compiler/**.rs'
+      - compiler/.github/workflows/cargo-deny.yml
+      - compiler/Cargo.lock
+      - compiler/Cargo.toml
+      - compiler/rust-toolchain.toml
+  workflow_dispatch:
+permissions: read-all
+name: cargo deny
+jobs:
+  compiler-cargodeny:
+    name: cargo deny
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: EmbarkStudios/cargo-deny-action@v1
+        with:
+          log-level: warn
+          command: check bans licenses sources
+          arguments: --all-features
diff --git a/compiler/.github/workflows/cargo-test.yml → .github/workflows/cargo-test.yml b/compiler/.github/workflows/cargo-test.yml → .github/workflows/cargo-test.yml
@@ -3,23 +3,23 @@ on:
     branches:
       - main
     paths:
-      - '**.rs'
-      - .github/workflows/cargo-test.yml
-      - Cargo.lock
-      - Cargo.toml
-      - rust-toolchain.toml
+      - 'compiler/**.rs'
+      - compiler/.github/workflows/cargo-test.yml
+      - compiler/Cargo.lock
+      - compiler/Cargo.toml
+      - compiler/rust-toolchain.toml
   pull_request:
     paths:
-      - '**.rs'
-      - .github/workflows/cargo-test.yml
-      - Cargo.lock
-      - Cargo.toml
-      - rust-toolchain.toml
+      - 'compiler/**.rs'
+      - compiler/.github/workflows/cargo-test.yml
+      - compiler/Cargo.lock
+      - compiler/Cargo.toml
+      - compiler/rust-toolchain.toml
   workflow_dispatch:
 permissions: read-all
 name: cargo test
 jobs:
-  cargotest:
+  compiler-cargotest:
     name: cargo test
     runs-on: ubuntu-latest
     steps:

diff --git a/compiler/Cargo.lock → Cargo.lock b/compiler/Cargo.lock → Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -0,0 +1,15 @@
+[workspace]
+
+members = [
+    "cli",
+    "compiler",
+]
+
+[workspace.package]
+authors = ["Adam Chalmers <adam.chalmers@kittycad.io>"]
+description = "Tooling for KCL (KittyCAD Language)"
+documentation = "docs.rs/kittycad-lang"
+readme = "README.md"
+publish = false
+repository = "https://github.com/KittyCAD/kcl"
+license = "MIT"
diff --git a/compiler/README.md → README.md b/compiler/README.md → README.md
diff --git a/compiler/cli/Cargo.toml → cli/Cargo.toml b/compiler/cli/Cargo.toml → cli/Cargo.toml
diff --git a/compiler/cli/src/main.rs → cli/src/main.rs b/compiler/cli/src/main.rs → cli/src/main.rs
diff --git a/compiler/.github/workflows/cargo-deny.yml b/compiler/.github/workflows/cargo-deny.yml
diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml
@@ -1,15 +1,15 @@
-[workspace]
+[package]
+name = "compiler"
+version = "0.1.0"
+edition = "2021"
+authors.workspace = true
+description.workspace = true
+documentation.workspace = true
+publish.workspace = true
+repository.workspace = true
+license.workspace = true
 
-members = [
-    "cli",
-    "compiler",
-]
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[workspace.package]
-authors = ["Adam Chalmers <adam.chalmers@kittycad.io>"]
-description = "Tooling for KCL (KittyCAD Language)"
-documentation = "docs.rs/kittycad-lang"
-readme = "README.md"
-publish = false
-repository = "https://github.com/KittyCAD/kcl"
-license = "MIT"
+[dependencies]
+nom = "7.1.3"
diff --git a/compiler/compiler/Cargo.toml b/compiler/compiler/Cargo.toml
diff --git a/compiler/compiler/src/lib.rs → compiler/src/lib.rs b/compiler/compiler/src/lib.rs → compiler/src/lib.rs
diff --git a/compiler/deny.toml → deny.toml b/compiler/deny.toml → deny.toml
@@ -264,7 +264,7 @@ allow-git = []
 
 [sources.allow-org]
 # 1 or more github.com organizations to allow git sources for
-github = ["KittyCAD", "oxidecomputer"]
+# github = ["KittyCAD", "oxidecomputer"]
 # 1 or more gitlab.com organizations to allow git sources for
 # gitlab = [""]
 # 1 or more bitbucket.org organizations to allow git sources for

diff --git a/compiler/rust-toolchain.toml → rust-toolchain.toml b/compiler/rust-toolchain.toml → rust-toolchain.toml