Skip to content

Commit

Permalink
Merge pull request #124 from holochain/hc-0.2-into-develop
Browse files Browse the repository at this point in the history
Hc 0.2 into develop
  • Loading branch information
robbiecarlton authored Sep 25, 2023
2 parents 21130bb + f12dab7 commit b6f6618
Show file tree
Hide file tree
Showing 36 changed files with 2,160 additions and 1,374 deletions.
1 change: 0 additions & 1 deletion .github/actions/extend-space/action.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Extends disk space on github hosted runners


name: "Extend space"
description: "Teases out as much free space as possible"

Expand Down
30 changes: 0 additions & 30 deletions .github/workflows/check-offline.yaml

This file was deleted.

14 changes: 7 additions & 7 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,32 @@ on:
# Trigger the workflow on push or pull request,
# but only for the main branch
push:
branches: [ main, develop, holochain-0.1 ]
branches: [ main, develop, holochain-0.1, holochain-0.2 ]
pull_request:
branches: [ main, develop, holochain-0.1 ]
branches: [ main, develop, holochain-0.1, holochain-0.2 ]

jobs:
testbuild:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Extend space
uses: ./.github/actions/extend-space

- name: Install nix
uses: cachix/install-nix-action@v18
uses: cachix/install-nix-action@v23
with:
install_url: https://releases.nixos.org/nix/nix-2.12.0/install
install_url: https://releases.nixos.org/nix/nix-2.13.3/install
extra_nix_config: |
experimental-features = flakes nix-command
- uses: cachix/cachix-action@v12
with:
name: holochain-ci

- name: Install and test
- name: Build and test
run: |
cd $GITHUB_WORKSPACE
nix develop --command bash -c "cargo install --path . && sh run_test.sh"
nix develop --override-input "versions/scaffolding" . .#ci --command ./run_test.sh
Loading

0 comments on commit b6f6618

Please sign in to comment.