diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index 0fa98d1276..92b5e225fd 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -2,7 +2,7 @@ name: ci-test on: push: - branches: [auto, canary, gha-test-*] + branches: [auto, canary, gha-test-*, main] pull_request: branches: [main, release-*, gha-test-*] @@ -121,7 +121,7 @@ jobs: runs-on: ubuntu-20.04-xl timeout-minutes: 60 needs: prepare - if: ${{ needs.prepare.outputs.test-rust == 'true' }} + # if: ${{ needs.prepare.outputs.test-rust == 'true' }} container: image: ghcr.io/diem/diem_build_environment:${{ needs.prepare.outputs.changes-target-branch }} volumes: @@ -137,7 +137,7 @@ jobs: key: ${{ needs.prepare.outputs.changes-target-branch }} - name: run unit tests run: | - $pre_command && cargo nextest --nextest-profile ci --jobs ${max_threads} --test-threads ${max_threads} --changed-since "origin/$TARGET_BRANCH" + $pre_command && cargo nextest --nextest-profile ci --jobs ${max_threads} --test-threads ${max_threads} #--changed-since "origin/$TARGET_BRANCH" env: TARGET_BRANCH: ${{ needs.prepare.outputs.changes-target-branch }} - name: run doctests @@ -177,7 +177,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - uses: ./.github/actions/build-setup - - uses: actions/cache@v2.1.6 + - uses: actions/cache@v2.1.7 with: path: "/opt/cargo/git\n/opt/cargo/registry\n/opt/cargo/.package-cache" key: crates-${{ runner.os }}-${{ hashFiles('Cargo.lock') }} @@ -204,7 +204,7 @@ jobs: - uses: actions/checkout@v2.4.0 with: ref: ${{ github.event.pull_request.head.sha }} - - uses: actions/cache@v2.1.6 + - uses: actions/cache@v2.1.7 with: path: "/opt/cargo/git\n/opt/cargo/registry\n/opt/cargo/.package-cache" key: crates-${{ runner.os }}-${{ hashFiles('Cargo.lock') }} diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 87be9b1fb2..df2a9ac34a 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -72,7 +72,7 @@ jobs: with: ref: ${{ matrix.target-branch }} - uses: ./.github/actions/build-setup - - uses: actions/cache@v2.1.6 + - uses: actions/cache@v2.1.7 with: path: "/opt/cargo/git\n/opt/cargo/registry\n/opt/cargo/.package-cache" key: crates-${{ runner.os }}-${{ hashFiles('Cargo.lock') }}