Skip to content

Commit

Permalink
refactor(ci): cache all of submodules/deps to speed up build time
Browse files Browse the repository at this point in the history
  • Loading branch information
@vpavlin
vpavlin committed May 15, 2023
1 parent 2defbd2 commit 175fb17
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 59 deletions.
44 changes: 14 additions & 30 deletions .github/workflows/ci-experimental.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,27 +61,19 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v3
with:
submodules: recursive

- name: Get submodule versions
- name: Get submodules hash
id: submodules
shell: bash
run: |
echo "nim-hash=$(git rev-parse HEAD:vendor/nimbus-build-system)" >> $GITHUB_OUTPUT
echo "zerokit-hash=$(git rev-parse HEAD:vendor/zerokit)" >> $GITHUB_OUTPUT
- name: Cache nim compiler
uses: actions/cache@v3
with:
path: vendor/nimbus-build-system/vendor/Nim/bin
key: ${{ runner.os }}-nim-${{ steps.submodules.outputs.nim-hash }}
echo "hash=$(git submodule status | sha256sum | sed 's/[ -]*//g')" >> $GITHUB_OUTPUT
- name: Cache zerokit artifacts
- name: Cache submodules
uses: actions/cache@v3
with:
path: vendor/zerokit/target/release
key: ${{ runner.os }}-zerokit-${{ steps.submodules.outputs.zerokit-hash }}
path: |
vendor/
.git/modules
key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }}

- name: Build binaries
run: make V=1 LOG_LEVEL=DEBUG QUICK_AND_DIRTY_COMPILER=1 v2
Expand All @@ -99,27 +91,19 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v3
with:
submodules: recursive

- name: Get submodule versions
- name: Get submodules hash
id: submodules
shell: bash
run: |
echo "nim-hash=$(git rev-parse HEAD:vendor/nimbus-build-system)" >> $GITHUB_OUTPUT
echo "zerokit-hash=$(git rev-parse HEAD:vendor/zerokit)" >> $GITHUB_OUTPUT
- name: Cache nim compiler
uses: actions/cache@v3
with:
path: vendor/nimbus-build-system/vendor/Nim/bin
key: ${{ runner.os }}-nim-${{ steps.submodules.outputs.nim-hash }}
echo "hash=$(git submodule status | sha256sum | sed 's/[ -]*//g')" >> $GITHUB_OUTPUT
- name: Cache zerokit artifacts
- name: Cache submodules
uses: actions/cache@v3
with:
path: vendor/zerokit/target/release
key: ${{ runner.os }}-zerokit-${{ steps.submodules.outputs.zerokit-hash }}
path: |
vendor/
.git/modules
key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }}

- name: Run tests
run: make V=1 LOG_LEVEL=DEBUG QUICK_AND_DIRTY_COMPILER=1 test2 testwakunode2
30 changes: 14 additions & 16 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,20 +133,19 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v3
with:
submodules: recursive

- name: Get submodule versions
- name: Get submodules hash
id: submodules
shell: bash
run: |
echo "nim-hash=$(git rev-parse HEAD:vendor/nimbus-build-system)" >> $GITHUB_OUTPUT
echo "hash=$(git submodule status | sha256sum | sed 's/[ -]*//g')" >> $GITHUB_OUTPUT
- name: Cache nim
- name: Cache submodules
uses: actions/cache@v3
with:
path: vendor/nimbus-build-system/vendor/Nim/bin
key: ${{ runner.os }}-nim-${{ steps.submodules.outputs.nim-hash }}
path: |
vendor/
.git/modules
key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }}

- name: Build binaries
run: make V=1 LOG_LEVEL=DEBUG QUICK_AND_DIRTY_COMPILER=1 v1
Expand All @@ -164,20 +163,19 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v3
with:
submodules: recursive

- name: Get submodule vesions
- name: Get submodules hash
id: submodules
shell: bash
run: |
echo "nim-hash=$(git rev-parse HEAD:vendor/nimbus-build-system)" >> $GITHUB_OUTPUT
echo "hash=$(git submodule status | sha256sum | sed 's/[ -]*//g')" >> $GITHUB_OUTPUT
- name: Cache nim
- name: Cache submodules
uses: actions/cache@v3
with:
path: vendor/nimbus-build-system/vendor/Nim/bin
key: ${{ runner.os }}-nim-${{ steps.submodules.outputs.nim-hash }}
path: |
vendor/
.git/modules
key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }}

- name: Run tests
run: make V=1 LOG_LEVEL=DEBUG QUICK_AND_DIRTY_COMPILER=1 test1
21 changes: 10 additions & 11 deletions .github/workflows/release-assets.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,18 @@ jobs:
- name: Checkout code
uses: actions/checkout@v2

# We need to do this because of how github cache works
# I am not sure we can move the cache file, so if we do not do this
# make update breaks because the cached compiler is there where the submodules
# are meant to go.
- name: Submodules
- name: Get submodules hash
id: submodules
run: |
git submodule update --init --recursive
- name: Cache nim
uses: actions/cache@v1
echo "hash=$(git submodule status | sha256sum | sed 's/[ -]*//g')" >> $GITHUB_OUTPUT
- name: Cache submodules
uses: actions/cache@v3
with:
path: vendor/nimbus-build-system/vendor/Nim/bin
key: ${{ runner.os }}-${{ matrix.env.NPROC }}-nim-${{ hashFiles('.gitmodules') }}
path: |
vendor/
.git/modules
key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }}

- name: Install dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion vendor/nim-libp2p
Submodule nim-libp2p updated from a1eb53 to 95e98e
2 changes: 1 addition & 1 deletion vendor/zerokit
Submodule zerokit updated 37 files
+20 −18 .github/workflows/ci.yml
+23 −20 .github/workflows/nightly-release.yml
+4 −1 .gitignore
+0 −3,806 Cargo.lock
+0 −32 Cross.toml
+2 −12 Makefile
+0 −4 README.md
+1 −1 multiplier/Cargo.toml
+1 −1 rln-wasm/Cargo.toml
+1 −6 rln-wasm/Makefile.toml
+0 −5 rln-wasm/README.md
+150 −243 rln-wasm/src/lib.rs
+11 −11 rln/Cargo.toml
+1 −1 rln/src/circuit.rs
+1 −3 rln/src/lib.rs
+0 −188 rln/src/pm_tree_adapter.rs
+1 −33 rln/src/poseidon_hash.rs
+47 −11 rln/src/poseidon_tree.rs
+28 −19 rln/src/protocol.rs
+41 −78 rln/src/public.rs
+10 −10 rln/src/utils.rs
+14 −25 rln/tests/ffi.rs
+543 −6 rln/tests/poseidon_tree.rs
+3 −16 rln/tests/protocol.rs
+3 −5 rln/tests/public.rs
+1 −1 semaphore/Cargo.toml
+2 −6 utils/Cargo.toml
+0 −5 utils/src/lib.rs
+0 −311 utils/src/merkle_tree/full_merkle_tree.rs
+531 −38 utils/src/merkle_tree/merkle_tree.rs
+0 −4 utils/src/merkle_tree/mod.rs
+0 −282 utils/src/merkle_tree/optimal_merkle_tree.rs
+0 −4 utils/src/pm_tree/mod.rs
+0 −75 utils/src/pm_tree/sled_adapter.rs
+4 −4 utils/src/poseidon/poseidon_constants.rs
+2 −2 utils/src/poseidon/poseidon_hash.rs
+6 −15 utils/tests/merkle_tree.rs

0 comments on commit 175fb17

Please sign in to comment.