Merge pull request #449 from ucb-substrate/v2p1-main

Implements most features of Substrate 2.1
ucb-substrate · Jan 21, 2025 · 876af6f · 876af6f
2 parents 098b8b8 + 4753b29
commit 876af6f
Show file tree

Hide file tree

Showing 390 changed files with 62,159 additions and 30,553 deletions.
diff --git a/.github/workflows/check-workspace.yml b/.github/workflows/check-workspace.yml
@@ -17,11 +17,18 @@ jobs:
           cargo fmt --check
       - name: Lint
         run: |
-          cargo hack --feature-powerset clippy --locked -- -D warnings
-      - name: Lint examples
+          cargo hack clippy --feature-powerset --locked -- -D warnings
+      - name: Lint release examples
         run: |
-          cargo hack --feature-powerset clippy --locked -- -D warnings
-        working-directory: examples
+          cargo hack clippy --feature-powerset --locked -- -D warnings
+        working-directory: examples/release
+      - name: Lint tests
+        run: |
+          cargo hack clippy --feature-powerset --tests --locked -- -D warnings
+      - name: Lint release examples tests
+        run: |
+          cargo hack clippy --feature-powerset --tests --locked -- -D warnings
+        working-directory: examples/release
   check-docs:
     name: check-docs
     runs-on: bwrc
@@ -35,14 +42,15 @@ jobs:
           RUSTDOCFLAGS: '-D warnings'
   test:
     name: test
-    runs-on: [bwrc, nfs]
+    runs-on: bwrc
     steps:
       - uses: actions/checkout@v3
       - name: Test
         run: cargo test --locked --all-features
-      - name: Test examples
+      - name: Test release examples
+        if: ${{ ! startsWith(github.ref, 'release-please--') }}
         run: cargo test --locked --all-features
-        working-directory: examples
+        working-directory: examples/release
   check-docs-site:
     name: check-docs-site
     runs-on: ubuntu-22.04
@@ -52,9 +60,9 @@ jobs:
         with:
           node-version: 18
           cache: 'yarn'
-          cache-dependency-path: docs/site/yarn.lock
+          cache-dependency-path: docs/docusaurus/yarn.lock
       - run: yarn install
-        working-directory: docs/site
+        working-directory: docs/docusaurus
       - run: yarn build
-        working-directory: docs/site
+        working-directory: docs/docusaurus
 
diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
@@ -1,4 +1,4 @@
-name: CI
+name: ci-main
 
 on:
   push:
@@ -26,7 +26,9 @@ jobs:
         with:
           repository: rohanku/release-please
           path: release-please
-          ref: dev
+          # Can change back to `dev` once this is merged into Substrate `main` and 
+          # the release-please `substrate-workspace` branch is merged into `dev`.
+          ref: substrate-workspace
       - uses: actions/setup-node@v3
         with:
           node-version: 18
@@ -84,38 +86,7 @@ jobs:
         working-directory: substrate
         run: ../cargo-workspaces/cargo-workspaces/target/debug/cargo-ws workspaces publish --from-git --token=${{ secrets.KTRA_TOKEN }} --registry=substrate --yes --allow-dirty
   deploy-api-docs:
-    name: Deploy API documentation
-    runs-on: bwrc
-    environment: main
-    needs: [ check-workspace ]
-    steps:
-      - uses: actions/checkout@v3
-      - uses: superfly/flyctl-actions/setup-flyctl@ddcac349402ef55840d9870785f4df1890768078
-      - run: just build
-        working-directory: docs/api
-      - run: flyctl deploy --remote-only --detach
-        working-directory: docs/api
-        env:
-          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN_API }}
+    uses: ./.github/workflows/deploy-api-docs.yml
   deploy-docs:
-    name: Deploy documentation
-    runs-on: ubuntu-22.04
-    environment: main
-    needs: [ check-workspace ]
-    steps:
-      - uses: actions/checkout@v3
-      - uses: superfly/flyctl-actions/setup-flyctl@master
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-          cache: 'yarn'
-          cache-dependency-path: docs/site/yarn.lock
-      - run: yarn install
-        working-directory: docs/site
-      - run: yarn build 
-        working-directory: docs/site
-      - run: flyctl deploy --remote-only --detach
-        working-directory: docs/site
-        env:
-          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN_DOCS }}
+    uses: ./.github/workflows/deploy-docs.yml
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: CI
+name: ci
 
 on:
   pull_request:

diff --git a/.github/workflows/deploy-api-docs.yml b/.github/workflows/deploy-api-docs.yml
@@ -0,0 +1,25 @@
+name: deploy-api-docs
+
+on:
+  workflow_call:
+  workflow_dispatch:
+    inputs:
+      name:
+
+env:
+    CARGO_TERM_COLOR: always
+    DOCS_NAME: ${{ inputs.name || github.ref.name }}
+    PUBLIC_DOCS_DIR: /tools/C/rohankumar/substrate_docs_public
+
+jobs:
+  deploy-api-docs:
+    name: Deploy API documentation
+    runs-on: bwrc
+    environment: docs
+    steps:
+      - uses: actions/checkout@v3
+      - uses: superfly/flyctl-actions/setup-flyctl@ddcac349402ef55840d9870785f4df1890768078
+      - run: ./deploy.sh ${{ env.PUBLIC_DOCS_DIR }} ${{ inputs.name || github.ref_name }}
+        working-directory: docs/api
+        env:
+          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN_API }}
diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
@@ -0,0 +1,31 @@
+name: deploy-docs
+
+on:
+  workflow_call:
+  workflow_dispatch:
+    inputs:
+      name:
+
+env:
+    CARGO_TERM_COLOR: always
+    DOCS_NAME: ${{ inputs.name || github.ref.name }}
+    PUBLIC_DOCS_DIR: /tools/C/rohankumar/substrate_docs_public
+
+jobs:
+  deploy-docs:
+    name: Deploy documentation
+    runs-on: bwrc
+    environment: docs
+    steps:
+      - uses: actions/checkout@v3
+      - uses: superfly/flyctl-actions/setup-flyctl@master
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: 'yarn'
+          cache-dependency-path: docs/docusaurus/yarn.lock
+      - run: ./deploy.sh ${{ env.PUBLIC_DOCS_DIR }} ${{ inputs.name || github.ref_name }}
+        working-directory: docs/docusaurus
+        env:
+          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN_DOCS }}
+
diff --git a/.github/workflows/deploy-release-api-docs.yml b/.github/workflows/deploy-release-api-docs.yml
@@ -0,0 +1,11 @@
+name: deploy-release-api-docs
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  deploy-api-docs:
+    uses: ./.github/workflows/deploy-api-docs.yml
+    with:
+      name: release
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -2,27 +2,39 @@
   "bins/cdl2spice": "0.0.0",
   "codegen": "0.8.1",
   "config": "0.2.5",
-  "docs/examples": "0.5.1",
-  "libs/atoll": "0.1.3",
+  "docs/snippets": "0.5.1",
+  "examples/latest/sky130_inverter": "0.0.0",
+  "examples/latest/spice_vdivider": "0.0.0",
+  "examples/latest/colbuf": "0.0.0",
+  "examples/latest/vdivider": "0.0.0",
+  "examples/latest/via": "0.0.0",
+  "examples/latest/substrate_api_examples": "0.0.0",
   "libs/cache": "0.5.0",
   "libs/diagnostics": "0.3.0",
   "libs/enumify": "0.1.0",
   "libs/enumify_macros": "0.1.0",
   "libs/gds": "0.3.0",
+  "libs/gdsconv": "0.1.0",
   "libs/geometry": "0.5.0",
   "libs/geometry_macros": "0.0.1",
   "libs/pathtree": "0.2.0",
   "libs/scir": "0.7.0",
   "libs/spice": "0.7.1",
+  "libs/layir": "0.1.0",
   "libs/lefdef": "0.0.0",
+  "libs/macrotools": "0.0.0",
   "libs/nutlex": "0.2.0",
   "libs/type_dispatch": "0.3.0",
   "libs/type_dispatch_macros": "0.3.0",
   "libs/uniquify": "0.2.0",
   "libs/verilog": "0.0.0",
-  "pdks/sky130pdk": "0.8.1",
+  "pdks/sky130": "0.8.1",
   "substrate": "0.8.1",
-  "tests": "0.0.0",
+  "tools/magic": "0.0.0",
+  "tools/netgen": "0.0.0",
   "tools/ngspice": "0.3.1",
-  "tools/spectre": "0.9.1"
+  "tools/pegasus": "0.0.0",
+  "tools/quantus": "0.0.0",
+  "tools/spectre": "0.9.1",
+  "tools/magic_netgen": "0.0.0"
 }