Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI] Add cachepot -- part2: use cache #807

Merged
merged 3 commits into from
Aug 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .github/workflows/all_checks_osmosis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ name: Test Tube (osmosis)
on:
workflow_call:
inputs:
unittest:
required: false
default: false
type: boolean
proptest:
required: false
default: false
Expand All @@ -26,7 +30,7 @@ jobs:
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
- name: Cleanup runner
run: sudo rm -rf /usr/local/share/boost && sudo rm -rf /usr/share/dotnet && sudo rm -rf /usr/local/lib/android && sudo rm -rf /opt/ghc && sudo rm -rf /opt/hostedtoolcache/CodeQL && sudo docker image prune --all --force
run: sudo rm -rf /usr/local/share/boost && sudo rm -rf /usr/share/dotnet && sudo rm -rf /usr/local/lib/android && sudo rm -rf /opt/ghc && sudo rm -rf /opt/hostedtoolcache/CodeQL && sudo docker system prune --all --force
- name: Restore dependencies
id: restore-cache
uses: actions/cache/restore@v4
Expand All @@ -36,7 +40,7 @@ jobs:
~/.cargo
~/go
~/target
key: ${{ runner.os }}-cache-osmosis-${{github.sha}}
key: ${{ runner.os }}-cache-osmosis-${{ github.sha }}
restore-keys: ${{ runner.os }}-cache-osmosis
- name: Update PATH
run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
Expand Down Expand Up @@ -75,13 +79,13 @@ jobs:
PROPTEST_CASES: 10
working-directory: smart-contracts/osmosis/contracts/cl-vault
- name: Store dependencies
if: ${{ (inputs.store_deps) && (steps.restore-cache.outputs.cache-hit == false) }}$
if: inputs.store_deps && !(steps.restore-cache.outputs.cache-hit == 'false')
uses: actions/cache/save@v4
with:
path: |
~/.cache/cachepot
~/.cargo
~/go
~/target
key: ${{ runner.os }}-cache-osmosis-${{github.sha}}
key: ${{ runner.os }}-cache-osmosis-${{ github.sha }}

9 changes: 6 additions & 3 deletions .github/workflows/cargo_build_cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ on:
required: true
type: string

env:
CARGO_TARGET_DIR: ~/target

jobs:
store-build-cache:
runs-on: ubuntu-latest
Expand All @@ -22,11 +25,11 @@ jobs:
~/.cache/cachepot
~/.cargo
~/go
smart-contracts/${{ inputs.workspace }}/**/target
~/target
key: ${{ runner.os }}-cargo-${{ inputs.workspace }}-${{github.sha}}
restore-keys: ${{ runner.os }}-cargo-${{ inputs.workspace }}
- name: Install cachepot
run: test -e $HOME/.cargo/bin/cachepot && echo "cachepot found -- skipping install" || cargo install --git https://github.com/paritytech/cachepot
run: test -e ~/.cargo/bin/cachepot && echo "cachepot found -- skipping install" || cargo install --git https://github.com/paritytech/cachepot
- name: Rust check
run: cargo check --all-targets --features test-tube
working-directory: smart-contracts/${{ inputs.workspace }}
Expand All @@ -39,5 +42,5 @@ jobs:
~/.cache/cachepot
~/.cargo
~/go
smart-contracts/${{ inputs.workspace }}/**/target
~/target
key: ${{ runner.os }}-cargo-${{ inputs.workspace }}-${{github.sha}}
17 changes: 4 additions & 13 deletions .github/workflows/rust_basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,13 @@ jobs:
uses: actions/checkout@v3
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
- name: Restore dependencies
uses: actions/cache/restore@v4
with:
path: |
~/.cargo
~/go
smart-contracts/${{ inputs.workspace }}/**/target
key: ${{ runner.os }}-cargo-${{ inputs.workspace }}-$GITHUB_SHA
restore-keys: ${{ runner.os }}-cargo-${{ inputs.workspace }}
- name: Rust lint
run: cargo lint
working-directory: smart-contracts/${{ inputs.workspace }}/${{ inputs.target }}
run: cargo clippy --all-targets -- -D warnings
working-directory: smart-contracts/${{ inputs.workspace }}
- name: Rust format check
run: cargo fmt --all -- --check
working-directory: smart-contracts/${{ inputs.workspace }}/${{ inputs.target }}
- name: Run unit-tests
if: inputs.unit_tests
- if: inputs.unit_tests
name: Run unit-tests
run: cargo unit-test
working-directory: smart-contracts/${{ inputs.workspace }}/${{ inputs.target }}
4 changes: 4 additions & 0 deletions .github/workflows/test_tube.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,9 @@ jobs:
uses: ./.github/workflows/all_checks_osmosis.yml
if: github.event_name == 'push'
with:
unittest: true
proptest: true
store_deps: true
pre-commit:
uses: ./.github/workflows/all_checks_osmosis.yml
if: github.event_name == 'pull_request'
Loading