diff --git a/.github/workflows/integration-jobs.yml b/.github/workflows/integration-jobs.yml index e662c44e406..5b614dc91a2 100644 --- a/.github/workflows/integration-jobs.yml +++ b/.github/workflows/integration-jobs.yml @@ -1,6 +1,5 @@ name: Integration - on: pull_request: paths-ignore: @@ -32,18 +31,18 @@ jobs: - uses: actions/setup-dotnet@v1 with: dotnet-version: '6.0.101' - # - uses: actions/cache@v2 - # with: - # path: ~/.nuget/packages - # key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} - # restore-keys: | - # ${{ runner.os }}-nuget- - # - uses: actions/cache@v2 - # with: - # path: ~/.local/share/ElasticManaged/elasticsearch-${{ matrix.stack_version }} - # key: ${{ runner.os }}-elastic-managed-${{ matrix.stack_version }} - # restore-keys: | - # ${{ runner.os }}-elastic-managed- + - uses: actions/cache@v2 + with: + path: ~/.nuget/packages + key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} + restore-keys: | + ${{ runner.os }}-nuget- + - uses: actions/cache@v2 + with: + path: ~/.local/share/ElasticManaged/elasticsearch-${{ matrix.stack_version }} + key: ${{ runner.os }}-elastic-managed-${{ matrix.stack_version }} + restore-keys: | + ${{ runner.os }}-elastic-managed- - run: "./build.sh integrate ${{ matrix.stack_version }} readonly,writable random:test_only_one --report" name: ${{ matrix.stack_version }} diff --git a/.github/workflows/test-jobs.yml b/.github/workflows/test-jobs.yml index 8d7c3da0e14..9a7906a5067 100644 --- a/.github/workflows/test-jobs.yml +++ b/.github/workflows/test-jobs.yml @@ -1,6 +1,5 @@ name: Tests - on: pull_request: paths-ignore: @@ -25,12 +24,12 @@ jobs: - uses: actions/setup-dotnet@v1 with: dotnet-version: '6.0.101' - # - uses: actions/cache@v2 - # with: - # path: ~/.nuget/packages - # key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} - # restore-keys: | - # ${{ runner.os }}-nuget- + - uses: actions/cache@v2 + with: + path: ~/.nuget/packages + key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} + restore-keys: | + ${{ runner.os }}-nuget- - run: ./build.sh test --report name: Test @@ -55,12 +54,12 @@ jobs: - uses: actions/setup-dotnet@v1 with: dotnet-version: '6.0.101' - # - uses: actions/cache@v2 - # with: - # path: ~/.nuget/packages - # key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} - # restore-keys: | - # ${{ runner.os }}-nuget- + - uses: actions/cache@v2 + with: + path: ~/.nuget/packages + key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} + restore-keys: | + ${{ runner.os }}-nuget- - run: ./build.sh canary --report name: Test