Skip to content

Commit ec2d9a6

Browse files
Merge pull request #275 from lightningrodlabs/actions-test
Refactor Github Workflows to no longer use Nix
2 parents e1c59e5 + 2ce5572 commit ec2d9a6

File tree

2 files changed

+16
-40
lines changed

2 files changed

+16
-40
lines changed

.github/workflows/release.yml

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -21,38 +21,14 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- uses: actions/checkout@v3
24-
- uses: actions/cache@v2
24+
- uses: dtolnay/[email protected]
2525
with:
26-
path: |
27-
~/.cargo/bin/
28-
~/.cargo/registry/index/
29-
~/.cargo/registry/cache/
30-
~/.cargo/git/db/
31-
.cargo/bin/
32-
.cargo/registry/index/
33-
.cargo/registry/cache/
34-
.cargo/git/db/
35-
target/
36-
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
37-
- name: Use Nix
38-
uses: cachix/install-nix-action@v20
39-
with:
40-
nix_path: nixpkgs=channel:nixos-21.05
41-
- name: Configure Nix substituters
42-
run: |
43-
set -xe
44-
mkdir -p ~/.config/nix/
45-
cp ./.github/nix.conf ~/.config/nix/
46-
- name: Use cachix
47-
uses: cachix/cachix-action@v12
48-
with:
49-
name: holochain-ci
50-
- name: Prepare Nix environment
51-
run: nix-shell --command "echo Completed"
26+
targets: wasm32-unknown-unknown
27+
- name: Install holochain_cli
28+
run: cargo install holochain_cli --version 0.1.0 --locked
5229
# build hApp
5330
- name: Build hApp
54-
run: |
55-
nix-shell --run "npm run happ-pack"
31+
run: bash ./scripts/happ-pack.sh
5632
# store happs as build artifacts
5733
- uses: actions/upload-artifact@master
5834
with:

.github/workflows/test.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
# Disabled for now, to not waste CI resources
22

33
# name: Cargo tests
4-
4+
#
55
# on: [ push, pull_request ]
6-
6+
#
77
# jobs:
88
# cargo_test:
99
# runs-on: ubuntu-latest
10-
10+
#
1111
# steps:
12-
# - uses: actions/checkout@v2
13-
# - uses: actions-rs/toolchain@v1
12+
# - uses: actions/checkout@v3
13+
# - uses: dtolnay/rust-toolchain@1.65
1414
# with:
15-
# toolchain: 1.58
16-
# target: wasm32-unknown-unknown
17-
18-
# - run: rustup update stable
15+
# targets: wasm32-unknown-unknown
16+
#
1917
# - run: rustc --version
2018
# - run: cargo --version
2119
# - run: rustup component list --installed
2220
# - run: rustup show
23-
24-
# - run: ./scripts/happ-test.sh
21+
#
22+
# - run: cargo install holochain_cli --version 0.1.0 --locked
23+
# - run: bash ./scripts/happ-pack.sh
24+
#

0 commit comments

Comments
 (0)