diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8a514937..7089804a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,38 +21,14 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/cache@v2 + - uses: dtolnay/rust-toolchain@1.65 with: - path: | - ~/.cargo/bin/ - ~/.cargo/registry/index/ - ~/.cargo/registry/cache/ - ~/.cargo/git/db/ - .cargo/bin/ - .cargo/registry/index/ - .cargo/registry/cache/ - .cargo/git/db/ - target/ - key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - - name: Use Nix - uses: cachix/install-nix-action@v20 - with: - nix_path: nixpkgs=channel:nixos-21.05 - - name: Configure Nix substituters - run: | - set -xe - mkdir -p ~/.config/nix/ - cp ./.github/nix.conf ~/.config/nix/ - - name: Use cachix - uses: cachix/cachix-action@v12 - with: - name: holochain-ci - - name: Prepare Nix environment - run: nix-shell --command "echo Completed" + targets: wasm32-unknown-unknown + - name: Install holochain_cli + run: cargo install holochain_cli --version 0.1.0 --locked # build hApp - name: Build hApp - run: | - nix-shell --run "npm run happ-pack" + run: bash ./scripts/happ-pack.sh # store happs as build artifacts - uses: actions/upload-artifact@master with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fe663a07..f8e6f855 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,24 +1,24 @@ # Disabled for now, to not waste CI resources # name: Cargo tests - +# # on: [ push, pull_request ] - +# # jobs: # cargo_test: # runs-on: ubuntu-latest - +# # steps: -# - uses: actions/checkout@v2 -# - uses: actions-rs/toolchain@v1 +# - uses: actions/checkout@v3 +# - uses: dtolnay/rust-toolchain@1.65 # with: -# toolchain: 1.58 -# target: wasm32-unknown-unknown - -# - run: rustup update stable +# targets: wasm32-unknown-unknown +# # - run: rustc --version # - run: cargo --version # - run: rustup component list --installed # - run: rustup show - -# - run: ./scripts/happ-test.sh +# +# - run: cargo install holochain_cli --version 0.1.0 --locked +# - run: bash ./scripts/happ-pack.sh +# \ No newline at end of file