From 36656468a18beca145c0e13098fb35938640ae29 Mon Sep 17 00:00:00 2001 From: Karl Bonnici Date: Mon, 1 May 2023 11:30:30 -0700 Subject: [PATCH 01/14] uncomment test workflow --- .github/workflows/test.yml | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fe663a07..c970e928 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,24 +1,25 @@ # Disabled for now, to not waste CI resources -# name: Cargo tests +name: Cargo tests -# on: [ push, pull_request ] +on: [ push, pull_request ] -# jobs: -# cargo_test: -# runs-on: ubuntu-latest +jobs: + cargo_test: + runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v2 -# - uses: actions-rs/toolchain@v1 -# with: -# toolchain: 1.58 -# target: wasm32-unknown-unknown + steps: + - uses: actions/checkout@v2 + - uses: actions-rs/toolchain@v1 + with: + toolchain: 1.58 + target: wasm32-unknown-unknown -# - run: rustup update stable -# - run: rustc --version -# - run: cargo --version -# - run: rustup component list --installed -# - run: rustup show + - run: rustup update stable + - run: rustc --version + - run: cargo --version + - run: rustup component list --installed + - run: rustup show -# - run: ./scripts/happ-test.sh + - run: ./scripts/happ-test.sh + - run: cargo install holochain_cli --version 0.1.0 --locked From ed17685c2f9526164f7b3cb88399ba8382d58098 Mon Sep 17 00:00:00 2001 From: Karl Bonnici Date: Mon, 1 May 2023 11:31:48 -0700 Subject: [PATCH 02/14] upgrade actions/checkout to v3 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c970e928..a1bfaf03 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: toolchain: 1.58 From d6898b6ee20ff79e20132e625f53b6adb94f981d Mon Sep 17 00:00:00 2001 From: Karl Bonnici Date: Mon, 1 May 2023 11:33:27 -0700 Subject: [PATCH 03/14] remove happ-test script call --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a1bfaf03..efd2555b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,5 +21,4 @@ jobs: - run: rustup component list --installed - run: rustup show - - run: ./scripts/happ-test.sh - run: cargo install holochain_cli --version 0.1.0 --locked From 7d6f2f80ddaf02a3f3e39bd5ed78a1851ca72841 Mon Sep 17 00:00:00 2001 From: Karl Bonnici Date: Mon, 1 May 2023 11:46:52 -0700 Subject: [PATCH 04/14] update rust version and run happ-pack.sh --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index efd2555b..bb0854d9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,13 +12,13 @@ jobs: - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.58 + toolchain: 1.69 target: wasm32-unknown-unknown - - run: rustup update stable - run: rustc --version - run: cargo --version - run: rustup component list --installed - run: rustup show - run: cargo install holochain_cli --version 0.1.0 --locked + - run: ./scripts/happ-pack.sh From ae1eafb771d2b6e8734c45af314a6522b96f275a Mon Sep 17 00:00:00 2001 From: Karl Bonnici Date: Mon, 1 May 2023 12:19:59 -0700 Subject: [PATCH 05/14] use bash to call happ-pack.sh --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bb0854d9..f0190834 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,4 +21,4 @@ jobs: - run: rustup show - run: cargo install holochain_cli --version 0.1.0 --locked - - run: ./scripts/happ-pack.sh + - run: bash ./scripts/happ-pack.sh From 84a05f6c5adeac5ba2fdc76e53fa06b3acee7f21 Mon Sep 17 00:00:00 2001 From: Karl Bonnici Date: Mon, 1 May 2023 12:23:14 -0700 Subject: [PATCH 06/14] replace nix with cargo install --- .github/workflows/release.yml | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8a514937..cd480b4d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,21 +34,8 @@ jobs: .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" + - name: Install holochain_cli + run: cargo install holochain_cli --version 0.1.0 --locked # build hApp - name: Build hApp run: | From 7fade24687e9e9eccb289169da957d37b32e4f37 Mon Sep 17 00:00:00 2001 From: Karl Bonnici Date: Mon, 1 May 2023 13:17:28 -0700 Subject: [PATCH 07/14] downgrade rust toolchain to 1.65 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f0190834..9bf029c5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.69 + toolchain: 1.65 target: wasm32-unknown-unknown - run: rustc --version From b99e74c0cf35a41a58fd15151d771e680a6c9c3e Mon Sep 17 00:00:00 2001 From: Karl Bonnici Date: Mon, 1 May 2023 14:04:42 -0700 Subject: [PATCH 08/14] swap out rust toolchain to maintained repo --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9bf029c5..0f921ca1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,10 +10,10 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable with: toolchain: 1.65 - target: wasm32-unknown-unknown + targets: wasm32-unknown-unknown - run: rustc --version - run: cargo --version From fe56ab7bf060f64cbd22f43bfebb68a2e9753afd Mon Sep 17 00:00:00 2001 From: Karl Bonnici Date: Mon, 1 May 2023 14:26:53 -0700 Subject: [PATCH 09/14] lock toolchain to 1.65 --- .github/workflows/test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0f921ca1..cfa67382 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,9 +10,8 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@stable + - uses: dtolnay/rust-toolchain@1.65 with: - toolchain: 1.65 targets: wasm32-unknown-unknown - run: rustc --version From 0c7ffcfa1d36f7c12467a9b77967074fa0f865db Mon Sep 17 00:00:00 2001 From: Karl Bonnici Date: Mon, 1 May 2023 14:40:53 -0700 Subject: [PATCH 10/14] switch to dtolnay/rust-toolchain in release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cd480b4d..1b9c39c9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: taiki-e/create-gh-release-action@v1 + - uses: dtolnay/rust-toolchain@1.65 env: # (required) GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From f6ea42a7a05e78062d11905fb5c2e185bc0cdd3b Mon Sep 17 00:00:00 2001 From: Karl Bonnici Date: Mon, 1 May 2023 14:46:43 -0700 Subject: [PATCH 11/14] replace npm run with directly calling happ-pack with bash --- .github/workflows/release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1b9c39c9..3d9b5468 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,8 +38,7 @@ jobs: 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: From 8a9891ed56b2cfc17ed52f1aef3c684d2c0ca060 Mon Sep 17 00:00:00 2001 From: Karl Bonnici Date: Mon, 1 May 2023 15:08:28 -0700 Subject: [PATCH 12/14] remove cache step from release.yml --- .github/workflows/release.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3d9b5468..fb67cc5c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@1.65 + - uses: taiki-e/create-gh-release-action@v1 env: # (required) GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -21,19 +21,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/cache@v2 - 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: Install holochain_cli run: cargo install holochain_cli --version 0.1.0 --locked # build hApp From 88c49e0c85c2306afcb1850b75ffb5884d08a7e3 Mon Sep 17 00:00:00 2001 From: Karl Bonnici Date: Mon, 1 May 2023 15:13:32 -0700 Subject: [PATCH 13/14] add rust toolchain to build-happ job --- .github/workflows/release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fb67cc5c..7089804a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,6 +21,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - uses: dtolnay/rust-toolchain@1.65 + with: + targets: wasm32-unknown-unknown - name: Install holochain_cli run: cargo install holochain_cli --version 0.1.0 --locked # build hApp From 2ce557258d919dce40af7b9bdc5bf9b831141eb8 Mon Sep 17 00:00:00 2001 From: Karl Bonnici Date: Mon, 1 May 2023 15:27:18 -0700 Subject: [PATCH 14/14] recomment test.yml --- .github/workflows/test.yml | 43 +++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cfa67382..f8e6f855 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,23 +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@v3 - - uses: dtolnay/rust-toolchain@1.65 - with: - targets: wasm32-unknown-unknown - - - run: rustc --version - - run: cargo --version - - run: rustup component list --installed - - run: rustup show - - - run: cargo install holochain_cli --version 0.1.0 --locked - - run: bash ./scripts/happ-pack.sh +# name: Cargo tests +# +# on: [ push, pull_request ] +# +# jobs: +# cargo_test: +# runs-on: ubuntu-latest +# +# steps: +# - uses: actions/checkout@v3 +# - uses: dtolnay/rust-toolchain@1.65 +# with: +# targets: wasm32-unknown-unknown +# +# - run: rustc --version +# - run: cargo --version +# - run: rustup component list --installed +# - run: rustup show +# +# - run: cargo install holochain_cli --version 0.1.0 --locked +# - run: bash ./scripts/happ-pack.sh +# \ No newline at end of file