diff --git a/.github/workflows/linux_checks.yml b/.github/workflows/linux_checks.yml index 92b7c855e..1a79cc270 100644 --- a/.github/workflows/linux_checks.yml +++ b/.github/workflows/linux_checks.yml @@ -17,11 +17,42 @@ jobs: uses: actions/setup-node@v1 with: node-version: 12 - - name: Run checks + - name: Set up ripgrep, pyaudio, gettext, rename run: | - # add requirements sudo apt update; sudo apt install portaudio19-dev gettext rename sudo snap install ripgrep --classic - export CARGO_TARGET_DIR=~/target - export RSPY_TARGET_DIR=~/target - make check build BUILDFLAGS="" + # Necessary for now for the cargo cache: + # https://github.com/actions/cache/issues/133#issuecomment-599102035 + - name: Fix ~/.cargo directory permissions + run: sudo chown -R $(whoami):$(id -ng) ~/.cargo/ + - name: Cache cargo registry + uses: actions/cache@v1 + with: + path: ~/.cargo/registry + key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.toml') }} + - name: Cache cargo index + uses: actions/cache@v1 + with: + path: ~/.cargo/git + key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.toml') }} + - name: Cache cargo build + uses: actions/cache@v1 + with: + path: ~/target + key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.toml') }} + - name: Cache pip wheels + uses: actions/cache@v1 + with: + path: ~/.cache/pip + key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} + - name: Configure project variables + run: | + echo "::set-env name=BUILDFLAGS::" + echo "::set-env name=RSPY_TARGET_DIR::~/target" + echo "::set-env name=CARGO_TARGET_DIR::~/target" + - name: Run checks + run: | + make check + - name: Run build + run: | + make build diff --git a/.github/workflows/windows_checks.yml b/.github/workflows/windows_checks.yml index e05d89404..8061092af 100644 --- a/.github/workflows/windows_checks.yml +++ b/.github/workflows/windows_checks.yml @@ -47,7 +47,7 @@ jobs: :: https://github.com/evandroforks/anki/runs/524857054?check_suite_focus=true :: 0 [main] pacman 748 dofork: child -1 - forked process 2896 died unexpectedly .\pacman --version - .\pacman -Sv --noconfirm --overwrite='*' bash + .\pacman -Sv --noconfirm --overwrite='*' bash .\pacman -Sv --noconfirm --overwrite='*' rsync - name: Set up scoop, gettext, ripgrep shell: cmd @@ -65,12 +65,37 @@ jobs: uses: actions/setup-node@v1 with: node-version: 12 + - name: Cache cargo registry + uses: actions/cache@v1 + with: + path: C:\Rust\.cargo\registry + key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.toml') }} + - name: Cache cargo index + uses: actions/cache@v1 + with: + path: C:\Rust\.cargo\git + key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.toml') }} + - name: Cache cargo build + uses: actions/cache@v1 + with: + path: ~\target + key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.toml') }} + - name: Cache pip wheels + uses: actions/cache@v1 + with: + path: ~\AppData\Local\pip\Cache + key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} + - name: Configure project variables + run: | + echo "::set-env name=RSPY_TARGET_DIR::~\target" + echo "::set-env name=CARGO_TARGET_DIR::~\target" - name: Run checks shell: cmd run: | echo on - set "RSPY_TARGET_DIR=%GITHUB_WORKSPACE%\target" - set "CARGO_TARGET_DIR=%GITHUB_WORKSPACE%\target" - set "BUILDFLAGS=" - :: set "SHELLFLAGS=-x" - make check build + make check BUILDFLAGS="" + - name: Run build + shell: cmd + run: | + echo on + make build BUILDFLAGS="" diff --git a/Makefile b/Makefile index 83325e02a..246a60c6c 100644 --- a/Makefile +++ b/Makefile @@ -181,3 +181,4 @@ push-i18n-ftl: pull-i18n .PHONY: push-i18n-po push-i18n-po: pull-i18n (cd qt/po && scripts/upload-latest-template) +