From 9324e446108694813f73fe06ba8a0931b0949c37 Mon Sep 17 00:00:00 2001 From: Christoph Herzog Date: Mon, 6 Feb 2023 16:20:02 +0100 Subject: [PATCH] Use Cloudflare as CI Cache Using Google Cloud creates very high egress cost. This reverts commit f4081dabae0f6480876081e05d568e0d74b9e206. --- .github/workflows/test.yaml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 87a339e197e..1ad0576af9e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -61,11 +61,11 @@ jobs: ~/.cargo/* ./target/* key: r22-${{ github.repository }}-${{ runner.os }}-${{ hashFiles('Cargo.lock') }}-wasmer-make-lint-linux-x64 - aws-s3-bucket: wasmer-github-ci-cache - aws-access-key-id: ${{ secrets.GOOGLE_CACHE_ID }} - aws-secret-access-key: ${{ secrets.GOOGLE_CACHE_SECRET }} + aws-s3-bucket: wasmer-rust-artifacts-cache + aws-access-key-id: ${{ secrets.CLOUDFLARE_ARTIFACTS_CACHE_ACCESS_TOKEN }} + aws-secret-access-key: ${{ secrets.CLOUDFLARE_ARTIFACTS_CACHE_ACCESS_KEY }} aws-region: auto - aws-endpoint: https://storage.googleapis.com + aws-endpoint: https://1541b1e8a3fc6ad155ce67ef38899700.r2.cloudflarestorage.com aws-s3-bucket-endpoint: false aws-s3-force-path-style: true - run: make lint @@ -343,11 +343,11 @@ jobs: ./target/* $CARGO_ROOT_DIR/* key: r22-${{ github.repository }}-${{ runner.os }}-${{ hashFiles('Cargo.lock') }}-wasmer-make-build-wasmer-${{ matrix.build-what.key }}-${{ matrix.metadata.build }} - aws-s3-bucket: wasmer-github-ci-cache - aws-access-key-id: ${{ secrets.GOOGLE_CACHE_ID }} - aws-secret-access-key: ${{ secrets.GOOGLE_CACHE_SECRET }} + aws-s3-bucket: wasmer-rust-artifacts-cache + aws-access-key-id: ${{ secrets.CLOUDFLARE_ARTIFACTS_CACHE_ACCESS_TOKEN }} + aws-secret-access-key: ${{ secrets.CLOUDFLARE_ARTIFACTS_CACHE_ACCESS_KEY }} aws-region: auto - aws-endpoint: https://storage.googleapis.com + aws-endpoint: https://1541b1e8a3fc6ad155ce67ef38899700.r2.cloudflarestorage.com aws-s3-bucket-endpoint: false aws-s3-force-path-style: true - name: Build C-API @@ -518,11 +518,11 @@ jobs: ~/.cargo/* ./target/* key: r22-${{ github.repository }}-${{ runner.os }}-${{ hashFiles('Cargo.lock') }}-wasmer-make-test-stage-${{ matrix.stage.make }}-${{ matrix.metadata.build }} - aws-s3-bucket: wasmer-github-ci-cache - aws-access-key-id: ${{ secrets.GOOGLE_CACHE_ID }} - aws-secret-access-key: ${{ secrets.GOOGLE_CACHE_SECRET }} + aws-s3-bucket: wasmer-rust-artifacts-cache + aws-access-key-id: ${{ secrets.CLOUDFLARE_ARTIFACTS_CACHE_ACCESS_TOKEN }} + aws-secret-access-key: ${{ secrets.CLOUDFLARE_ARTIFACTS_CACHE_ACCESS_KEY }} aws-region: auto - aws-endpoint: https://storage.googleapis.com + aws-endpoint: https://1541b1e8a3fc6ad155ce67ef38899700.r2.cloudflarestorage.com aws-s3-bucket-endpoint: false aws-s3-force-path-style: true - name: ${{ matrix.stage.description }} @@ -593,11 +593,11 @@ jobs: ~/.cargo/* ./target/* key: r22-${{ github.repository }}-${{ runner.os }}-${{ hashFiles('Cargo.lock') }}-wasmer-make-test-integration-cli-${{ matrix.build }} - aws-s3-bucket: wasmer-github-ci-cache - aws-access-key-id: ${{ secrets.GOOGLE_CACHE_ID }} - aws-secret-access-key: ${{ secrets.GOOGLE_CACHE_SECRET }} + aws-s3-bucket: wasmer-rust-artifacts-cache + aws-access-key-id: ${{ secrets.CLOUDFLARE_ARTIFACTS_CACHE_ACCESS_TOKEN }} + aws-secret-access-key: ${{ secrets.CLOUDFLARE_ARTIFACTS_CACHE_ACCESS_KEY }} aws-region: auto - aws-endpoint: https://storage.googleapis.com + aws-endpoint: https://1541b1e8a3fc6ad155ce67ef38899700.r2.cloudflarestorage.com aws-s3-bucket-endpoint: false aws-s3-force-path-style: true - name: Prepare package directory