Caching should now work

This commit is contained in:
Grant Limberg 2023-05-01 15:57:48 -07:00
parent 71cd538e34
commit 220f1a1833
No known key found for this signature in database
GPG key ID: 8F2F97D3BE8D7735
2 changed files with 50 additions and 76 deletions

View file

@ -24,14 +24,6 @@ jobs:
with: with:
workspaces: | workspaces: |
zeroidc/ zeroidc/
# path: |
# ~/.cargo/bin/
# ~/.cargo/registry/index/
# ~/.cargo/registry/cache/
# ~/.cargo/git/db/
# ./zeroidc/target/
key: ${{ runner.os }}-cargo-${{ hashFiles('zeroidc//Cargo.lock') }}
restore-keys: ${{ runner.os }}-cargo-
- name: make - name: make
run: make run: make
- name: selftest - name: selftest
@ -56,17 +48,11 @@ jobs:
override: true override: true
components: rustfmt, clippy components: rustfmt, clippy
- name: Set up cargo cache - name: Set up cargo cache
uses: actions/cache@v3 uses: Swatinem/rust-cache@v2
continue-on-error: false continue-on-error: false
with: with:
path: | workspaces: |
~/.cargo/bin/ zeroidc/
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
restore-keys: ${{ runner.os }}-cargo-
- name: make - name: make
run: make run: make
- name: selftest - name: selftest
@ -91,17 +77,11 @@ jobs:
override: true override: true
components: rustfmt, clippy components: rustfmt, clippy
- name: Set up cargo cache - name: Set up cargo cache
uses: actions/cache@v3 uses: Swatinem/rust-cache@v2
continue-on-error: false continue-on-error: false
with: with:
path: | workspaces: |
~/.cargo/bin/ zeroidc/
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
restore-keys: ${{ runner.os }}-cargo-
- name: setup msbuild - name: setup msbuild
uses: microsoft/setup-msbuild@v1.1.3 uses: microsoft/setup-msbuild@v1.1.3
- name: msbuild - name: msbuild

View file

@ -1,57 +1,51 @@
# on: [ push ] on: [ push ]
# jobs: jobs:
# build_ubuntu: build_ubuntu:
# runs-on: ubuntu-latest runs-on: ubuntu-latest
# steps: steps:
# - name: gitconfig - name: gitconfig
# run: | run: |
# git config --global core.autocrlf input git config --global core.autocrlf input
# - name: checkout - name: checkout
# uses: actions/checkout@v3 uses: actions/checkout@v3
# with: with:
# fetch-depth: 0 fetch-depth: 0
# - name: Install Rust - name: Install Rust
# uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
# with: with:
# toolchain: stable toolchain: stable
# target: x86_64-unknown-linux-gnu target: x86_64-unknown-linux-gnu
# override: true override: true
# components: rustfmt, clippy components: rustfmt, clippy
# - name: Set up cargo cache - name: Set up cargo cache
# uses: actions/cache@v3 uses: Swatinem/rust-cache@v2
# continue-on-error: false continue-on-error: false
# with: with:
# path: | workspaces: |
# ~/.cargo/bin/ zeroidc/
# ~/.cargo/registry/index/
# ~/.cargo/registry/cache/
# ~/.cargo/git/db/
# **/target/
# key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
# restore-keys: ${{ runner.os }}-cargo-
# - name: validate-1m-linux - name: validate-1m-linux
# env: env:
# CC: 'gcc' CC: 'gcc'
# CXX: 'g++' CXX: 'g++'
# BRANCH: ${{ github.ref_name }} BRANCH: ${{ github.ref_name }}
# run: | run: |
# sudo apt install -y valgrind xmlstarlet gcovr iperf3 sudo apt install -y valgrind xmlstarlet gcovr iperf3
# make one ZT_COVERAGE=1 ZT_TRACE=1 make one ZT_COVERAGE=1 ZT_TRACE=1
# sudo chmod +x ./.github/workflows/validate-1m-linux.sh sudo chmod +x ./.github/workflows/validate-1m-linux.sh
# sudo ./.github/workflows/validate-1m-linux.sh sudo ./.github/workflows/validate-1m-linux.sh
# - name: Archive test results - name: Archive test results
# uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
# with: with:
# name: ${{github.sha}}-test-results name: ${{github.sha}}-test-results
# path: "*test-results*" path: "*test-results*"
# - name: final-report - name: final-report
# run: | run: |
# sudo chmod +x ./.github/workflows/report.sh sudo chmod +x ./.github/workflows/report.sh
# sudo ./.github/workflows/report.sh sudo ./.github/workflows/report.sh