Skip to content

Commit

Permalink
Merge branch 'main' into refactor/switch-to-new-holonix
Browse files Browse the repository at this point in the history
  • Loading branch information
mattyg committed Sep 19, 2024
2 parents 75541b3 + bb00ec0 commit 8ed1dff
Show file tree
Hide file tree
Showing 40 changed files with 4,577 additions and 2,265 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-deploy-site.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

- name: Install and Build 🔧
run: |
nix develop --command bash -c "pnpm install && pnpm -F docs build"
nix develop --no-update-lock-file --command bash -c "pnpm install && pnpm -F docs build"
- name: Deploy 🚀
uses: JamesIves/[email protected]
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/build-hc-pilot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,20 @@ jobs:
- uses: actions/checkout@v3

- name: Install nix
uses: cachix/install-nix-action@v25
uses: cachix/install-nix-action@v27
with:
nix_path: nixpkgs=channel:nixos-unstable
github_access_token: ${{ secrets.GITHUB_TOKEN }}
nix_path: nixpkgs=channel:nixos-24.05

- uses: cachix/cachix-action@v14
- uses: cachix/cachix-action@v15
with:
name: holochain-ci

- uses: cachix/cachix-action@v14
- uses: cachix/cachix-action@v15
with:
name: holochain-open-dev

- uses: cachix/cachix-action@v14
- uses: cachix/cachix-action@v15
with:
name: darksoil-studio

Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/build-scaffold-holochain-runtime.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,25 @@ jobs:
uses: ./.github/actions/extend-space

- name: Install nix
uses: cachix/install-nix-action@v25
uses: cachix/install-nix-action@v27
with:
nix_path: nixpkgs=channel:nixos-unstable
github_access_token: ${{ secrets.GITHUB_TOKEN }}
nix_path: nixpkgs=channel:nixos-24.05

- uses: cachix/cachix-action@v14
- uses: cachix/cachix-action@v15
with:
name: holochain-ci

- uses: cachix/cachix-action@v14
- uses: cachix/cachix-action@v15
with:
name: holochain-open-dev

- uses: cachix/cachix-action@v14
- uses: cachix/cachix-action@v15
with:
name: darksoil-studio

- name: Test scaffold-holochain-runtime
if: ${{ matrix.os == 'ubuntu-latest' }} # in macos-latest, this fails with "no space left on device" error
run: |
cargo test -p scaffold-holochain-runtime
sh ./crates/scaffold-holochain-runtime/run_test.sh
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/build-scaffold-tauri-happ.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,25 @@ jobs:
uses: ./.github/actions/extend-space

- name: Install nix
uses: cachix/install-nix-action@v25
uses: cachix/install-nix-action@v27
with:
nix_path: nixpkgs=channel:nixos-unstable
github_access_token: ${{ secrets.GITHUB_TOKEN }}
nix_path: nixpkgs=channel:nixos-24.05

- uses: cachix/cachix-action@v14
- uses: cachix/cachix-action@v15
with:
name: holochain-ci

- uses: cachix/cachix-action@v14
- uses: cachix/cachix-action@v15
with:
name: holochain-open-dev

- uses: cachix/cachix-action@v14
- uses: cachix/cachix-action@v15
with:
name: darksoil-studio

- name: Test scaffold-tauri-happ
if: ${{ matrix.os == 'ubuntu-latest' }} # in macos-latest, this fails with "no space left on device" error
run: |
cargo test -p scaffold-tauri-happ
sh ./crates/scaffold-tauri-happ/run_test.sh
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/cache-devshells.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,20 @@ jobs:
uses: ./.github/actions/extend-space

- name: Install nix
uses: cachix/install-nix-action@v25
uses: cachix/install-nix-action@v27
with:
nix_path: nixpkgs=channel:nixos-unstable
github_access_token: ${{ secrets.GITHUB_TOKEN }}
nix_path: nixpkgs=channel:nixos-24.05

- uses: cachix/cachix-action@v14
- uses: cachix/cachix-action@v15
with:
name: holochain-ci

- uses: cachix/cachix-action@v14
- uses: cachix/cachix-action@v15
with:
name: holochain-open-dev

- uses: cachix/cachix-action@v14
- uses: cachix/cachix-action@v15
with:
name: darksoil-studio

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,21 @@ jobs:
steps:
- uses: actions/checkout@v4


- name: Install nix
uses: cachix/install-nix-action@v25
uses: cachix/install-nix-action@v27
with:
nix_path: nixpkgs=channel:nixos-unstable
github_access_token: ${{ secrets.GITHUB_TOKEN }}
nix_path: nixpkgs=channel:nixos-24.05

- uses: cachix/cachix-action@v14
- uses: cachix/cachix-action@v15
with:
name: holochain-ci

- uses: cachix/cachix-action@v14
- uses: cachix/cachix-action@v15
with:
name: holochain-open-dev

- uses: cachix/cachix-action@v14
- uses: cachix/cachix-action@v15
with:
name: darksoil-studio

Expand Down
Loading

0 comments on commit 8ed1dff

Please sign in to comment.