Renamed crates

darksoil-studio · May 16, 2024 · 95c26ea · 95c26ea
1 parent 8b8d201
commit 95c26ea
Show file tree

Hide file tree

Showing 37 changed files with 69 additions and 6 deletions.
diff --git a/.github/workflows/build-scaffold-holochain-runtime.yaml b/.github/workflows/build-scaffold-holochain-runtime.yaml
@@ -0,0 +1,56 @@
+name: "build-scaffold-holochain-runtime"
+on:
+  # Trigger the workflow on push or pull request,
+  # but only for the main branch
+  push: 
+    branches: [ main, develop ]
+  pull_request:
+    branches: [ main, develop ]
+
+jobs:
+  build-scaffold-holochain-runtime:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Extend space
+        uses: ./.github/actions/extend-space
+
+      - name: Install nix
+        uses: cachix/install-nix-action@v25
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+
+      - uses: cachix/cachix-action@v14
+        with:
+          name: holochain-ci
+
+      - uses: cachix/cachix-action@v14
+        with:
+          name: holochain-open-dev
+
+      - uses: cachix/cachix-action@v14
+        with:
+          name: darksoil-studio
+
+      - name: Build scaffold-holochain-runtime
+        run: |
+          nix build -L .#scaffold-holochain-runtime
+
+      - name: Test scaffold-holochain-runtime
+        run: |
+          sh ./crates/scaffold-holochain-runtime/run_test.sh
+
+      - name: Cache scaffold-holochain-runtime
+        if: github.event_name != 'pull_request' && github.ref_name == 'main'
+        env:
+          CACHIX_AUTH_TOKEN: "${{ secrets.DARKSOIL_CACHIX_AUTH_TOKEN }}"
+        run: |
+          cachix push darksoil-studio $(nix path-info .#scaffold-holochain-runtime)
+          cachix pin darksoil-studio scaffold-holochain-runtime $(nix path-info .#scaffold-holochain-runtime)
+
diff --git a/.github/workflows/build-scaffold-tauri-app.yaml b/.github/workflows/build-scaffold-tauri-app.yaml
@@ -42,6 +42,10 @@ jobs:
         run: |
           nix build -L .#scaffold-tauri-app
 
+      - name: Test scaffold-tauri-app
+        run: |
+          sh ./crates/scaffold-tauri-app/run_test.sh
+
       - name: Cache scaffold-tauri-app
         if: github.event_name != 'pull_request' && github.ref_name == 'main'
         env:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/scaffold_holochain_runtime/Cargo.toml → crates/scaffold-holochain-runtime/Cargo.toml b/crates/scaffold_holochain_runtime/Cargo.toml → crates/scaffold-holochain-runtime/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "scaffold_holochain_runtime"
+name = "scaffold-holochain-runtime"
 version = "0.1.0"
 edition = "2021"
 

diff --git a/...es/scaffold_holochain_runtime/default.nix → ...es/scaffold-holochain-runtime/default.nix b/...es/scaffold_holochain_runtime/default.nix → ...es/scaffold-holochain-runtime/default.nix
diff --git a/...es/scaffold_holochain_runtime/run_test.sh → ...es/scaffold-holochain-runtime/run_test.sh b/...es/scaffold_holochain_runtime/run_test.sh → ...es/scaffold-holochain-runtime/run_test.sh
diff --git a/...caffold_holochain_runtime/src/bin/main.rs → ...caffold-holochain-runtime/src/bin/main.rs b/...caffold_holochain_runtime/src/bin/main.rs → ...caffold-holochain-runtime/src/bin/main.rs
diff --git a/crates/scaffold_holochain_runtime/src/lib.rs → crates/scaffold-holochain-runtime/src/lib.rs b/crates/scaffold_holochain_runtime/src/lib.rs → crates/scaffold-holochain-runtime/src/lib.rs
diff --git a/...templates/holochain-runtime/README.md.hbs → ...templates/holochain-runtime/README.md.hbs b/...templates/holochain-runtime/README.md.hbs → ...templates/holochain-runtime/README.md.hbs
diff --git a/...templates/holochain-runtime/flake.nix.hbs → ...templates/holochain-runtime/flake.nix.hbs b/...templates/holochain-runtime/flake.nix.hbs → ...templates/holochain-runtime/flake.nix.hbs
diff --git a/...emplates/holochain-runtime/index.html.hbs → ...emplates/holochain-runtime/index.html.hbs b/...emplates/holochain-runtime/index.html.hbs → ...emplates/holochain-runtime/index.html.hbs
diff --git a/...plates/holochain-runtime/package.json.hbs → ...plates/holochain-runtime/package.json.hbs b/...plates/holochain-runtime/package.json.hbs → ...plates/holochain-runtime/package.json.hbs
diff --git a/...olochain-runtime/src-tauri/Cargo.toml.hbs → ...olochain-runtime/src-tauri/Cargo.toml.hbs b/...olochain-runtime/src-tauri/Cargo.toml.hbs → ...olochain-runtime/src-tauri/Cargo.toml.hbs
diff --git a/.../holochain-runtime/src-tauri/build.rs.hbs → .../holochain-runtime/src-tauri/build.rs.hbs b/.../holochain-runtime/src-tauri/build.rs.hbs → .../holochain-runtime/src-tauri/build.rs.hbs
diff --git a/...time/src-tauri/capabilities/main.json.hbs → ...time/src-tauri/capabilities/main.json.hbs b/...time/src-tauri/capabilities/main.json.hbs → ...time/src-tauri/capabilities/main.json.hbs
diff --git a/...olochain-runtime/src-tauri/src/lib.rs.hbs → ...olochain-runtime/src-tauri/src/lib.rs.hbs b/...olochain-runtime/src-tauri/src/lib.rs.hbs → ...olochain-runtime/src-tauri/src/lib.rs.hbs
diff --git a/...lochain-runtime/src-tauri/src/main.rs.hbs → ...lochain-runtime/src-tauri/src/main.rs.hbs b/...lochain-runtime/src-tauri/src/main.rs.hbs → ...lochain-runtime/src-tauri/src/main.rs.hbs
diff --git a/...ain-runtime/src-tauri/tauri.conf.json.hbs → ...ain-runtime/src-tauri/tauri.conf.json.hbs b/...ain-runtime/src-tauri/tauri.conf.json.hbs → ...ain-runtime/src-tauri/tauri.conf.json.hbs
diff --git a/...mplates/holochain-runtime/src/main.ts.hbs → ...mplates/holochain-runtime/src/main.ts.hbs b/...mplates/holochain-runtime/src/main.ts.hbs → ...mplates/holochain-runtime/src/main.ts.hbs
diff --git a/...ates/holochain-runtime/src/styles.css.hbs → ...ates/holochain-runtime/src/styles.css.hbs b/...ates/holochain-runtime/src/styles.css.hbs → ...ates/holochain-runtime/src/styles.css.hbs
diff --git a/...lates/holochain-runtime/tsconfig.json.hbs → ...lates/holochain-runtime/tsconfig.json.hbs b/...lates/holochain-runtime/tsconfig.json.hbs → ...lates/holochain-runtime/tsconfig.json.hbs
diff --git a/...ates/holochain-runtime/vite.config.ts.hbs → ...ates/holochain-runtime/vite.config.ts.hbs b/...ates/holochain-runtime/vite.config.ts.hbs → ...ates/holochain-runtime/vite.config.ts.hbs
diff --git a/crates/scaffold_tauri_app/Cargo.toml → crates/scaffold-tauri-app/Cargo.toml b/crates/scaffold_tauri_app/Cargo.toml → crates/scaffold-tauri-app/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "scaffold_tauri_app"
+name = "scaffold-tauri-app"
 version = "0.1.0"
 edition = "2021"
 

diff --git a/crates/scaffold_tauri_app/default.nix → crates/scaffold-tauri-app/default.nix b/crates/scaffold_tauri_app/default.nix → crates/scaffold-tauri-app/default.nix
diff --git a/crates/scaffold_tauri_app/fixture/flake.nix → crates/scaffold-tauri-app/fixture/flake.nix b/crates/scaffold_tauri_app/fixture/flake.nix → crates/scaffold-tauri-app/fixture/flake.nix
diff --git a/...s/scaffold_tauri_app/fixture/package.json → ...s/scaffold-tauri-app/fixture/package.json b/...s/scaffold_tauri_app/fixture/package.json → ...s/scaffold-tauri-app/fixture/package.json
diff --git a/...d_tauri_app/fixture/workdir/web-happ.yaml → ...d-tauri-app/fixture/workdir/web-happ.yaml b/...d_tauri_app/fixture/workdir/web-happ.yaml → ...d-tauri-app/fixture/workdir/web-happ.yaml
diff --git a/crates/scaffold_tauri_app/run_test.sh → crates/scaffold-tauri-app/run_test.sh b/crates/scaffold_tauri_app/run_test.sh → crates/scaffold-tauri-app/run_test.sh
@@ -11,7 +11,7 @@ nix flake update
 nix develop --command bash -c \"npm i\"
 "
 
-nix run .#scaffold-tauri-app  -- forum-scaffold-tauri-app --path /tmp/forum/scaffold-tauri-app
+nix run .#scaffold-tauri-app -- forum-scaffold-tauri-app --path /tmp/forum-scaffold-tauri-app
 
 cd /tmp/forum-scaffold-tauri-app
 

diff --git a/crates/scaffold_tauri_app/src/bin/main.rs → crates/scaffold-tauri-app/src/bin/main.rs b/crates/scaffold_tauri_app/src/bin/main.rs → crates/scaffold-tauri-app/src/bin/main.rs
diff --git a/crates/scaffold_tauri_app/src/lib.rs → crates/scaffold-tauri-app/src/lib.rs b/crates/scaffold_tauri_app/src/lib.rs → crates/scaffold-tauri-app/src/lib.rs
diff --git a/.../executable-happ/src-tauri/Cargo.toml.hbs → .../executable-happ/src-tauri/Cargo.toml.hbs b/.../executable-happ/src-tauri/Cargo.toml.hbs → .../executable-happ/src-tauri/Cargo.toml.hbs
diff --git a/...es/executable-happ/src-tauri/build.rs.hbs → ...es/executable-happ/src-tauri/build.rs.hbs b/...es/executable-happ/src-tauri/build.rs.hbs → ...es/executable-happ/src-tauri/build.rs.hbs
diff --git a/...happ/src-tauri/capabilities/main.json.hbs → ...happ/src-tauri/capabilities/main.json.hbs b/...happ/src-tauri/capabilities/main.json.hbs → ...happ/src-tauri/capabilities/main.json.hbs
diff --git a/.../executable-happ/src-tauri/src/lib.rs.hbs → .../executable-happ/src-tauri/src/lib.rs.hbs b/.../executable-happ/src-tauri/src/lib.rs.hbs → .../executable-happ/src-tauri/src/lib.rs.hbs
diff --git a/...executable-happ/src-tauri/src/main.rs.hbs → ...executable-happ/src-tauri/src/main.rs.hbs b/...executable-happ/src-tauri/src/main.rs.hbs → ...executable-happ/src-tauri/src/main.rs.hbs
diff --git a/...utable-happ/src-tauri/tauri.conf.json.hbs → ...utable-happ/src-tauri/tauri.conf.json.hbs b/...utable-happ/src-tauri/tauri.conf.json.hbs → ...utable-happ/src-tauri/tauri.conf.json.hbs
diff --git a/flake.nix b/flake.nix
@@ -72,7 +72,10 @@
         };
       };
 
-      imports = [ ./crates/scaffold_tauri_app/default.nix ];
+      imports = [
+        ./crates/scaffold-tauri-app/default.nix
+        ./crates/scaffold-holochain-runtime/default.nix
+      ];
 
       systems = builtins.attrNames inputs.holochain.devShells;
       perSystem = { inputs', config, pkgs, system, lib, ... }: rec {