Skip to content

Commit

Permalink
chore: update s3 buckets (#1) (#1026)
Browse files Browse the repository at this point in the history
* chore: update s3 buckets

* chore: fix permissions

* fix: summarize s3 buckets
  • Loading branch information
jonathanpwang authored Dec 13, 2024
1 parent 05a0561 commit 593206a
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 24 deletions.
18 changes: 2 additions & 16 deletions .github/runs-on.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,7 @@
images:
arm64-rust-dev-32gb:
platform: "linux"
arch: "arm64"
owner: "912452651013"
name: "arm64-rust-dev-32gb"
ami: "ami-0d33c5daee4966517"

arm64-rust-dev-1024gb:
platform: "linux"
arch: "arm64"
owner: "912452651013"
name: "arm64-rust-dev-1024gb"
ami: "ami-06dd8940c223fd887"

arm64-rust-riscv-dev-32gb:
platform: "linux"
arch: "arm64"
owner: "912452651013"
owner: "405894839083"
name: "arm64-rust-riscv-dev-32gb"
ami: "ami-0276be31ce0779233"
ami: "ami-040a96edd406c9478"
9 changes: 6 additions & 3 deletions .github/workflows/benchmark-call.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,17 @@ on:
description: Whether to run the e2e benchmark

env:
S3_PATH: s3://axiom-workflow-data-sandbox-us-east-1/benchmark/github/results
S3_METRICS_PATH: s3://axiom-workflow-data-sandbox-us-east-1/benchmark/github/metrics
PUBLIC_S3_PATH: s3://axiom-public-data-sandbox-us-east-1/benchmark/github/flamegraphs
S3_PATH: s3://openvm-public-data-sandbox-us-east-1/benchmark/github/results
S3_METRICS_PATH: s3://openvm-public-data-sandbox-us-east-1/benchmark/github/metrics
PUBLIC_S3_PATH: s3://openvm-public-data-sandbox-us-east-1/benchmark/github/flamegraphs
FEATURE_FLAGS: "bench-metrics,parallel,nightly-features"
CMD_ARGS: ""
INPUT_ARGS: ""
CARGO_NET_GIT_FETCH_WITH_CLI: "true"

permissions:
contents: write

jobs:
bench-new:
name: Run benchmark on workflow ref/branch
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ env:
CURRENT_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
CARGO_NET_GIT_FETCH_WITH_CLI: "true"

permissions:
contents: write
pull-requests: write

jobs:
create-matrix:
runs-on:
Expand Down Expand Up @@ -167,14 +171,14 @@ jobs:
continue
fi
echo "Downloading results for benchmark: $md_file"
s5cmd cp "s3://axiom-workflow-data-sandbox-us-east-1/benchmark/github/results/${md_file}" "${md_file}"
s5cmd cp "s3://openvm-public-data-sandbox-us-east-1/benchmark/github/results/${md_file}" "${md_file}"
done <<< "$md_files"
E2E_FILE_LIST=""
if [[ -n "$e2e_md_files" ]]; then
while read e2e_md_file; do
echo "Downloading results for benchmark: $e2e_md_file"
s5cmd cp "s3://axiom-workflow-data-sandbox-us-east-1/benchmark/github/results/${e2e_md_file}" "${e2e_md_file}"
s5cmd cp "s3://openvm-public-data-sandbox-us-east-1/benchmark/github/results/${e2e_md_file}" "${e2e_md_file}"
done <<< "$e2e_md_files"
E2E_FILE_LIST="${e2e_md_file_list}"
fi
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/publish-mdbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
paths:
- "book/**"

permissions:
contents: write

jobs:
publish:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -44,7 +47,7 @@ jobs:

- name: Deploy to Vercel
env:
VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }} # Token stored in GitHub Secrets
VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }} # Token stored in GitHub Secrets
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
run: |
Expand Down
4 changes: 2 additions & 2 deletions ci/scripts/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ add_metadata() {
echo "" >> $result_path
for file in .bench_metrics/flamegraphs/*.svg; do
filename=$(basename "$file")
flamegraph_url=https://axiom-public-data-sandbox-us-east-1.s3.us-east-1.amazonaws.com/benchmark/github/flamegraphs/${current_sha}/${filename}
flamegraph_url=https://openvm-public-data-sandbox-us-east-1.s3.us-east-1.amazonaws.com/benchmark/github/flamegraphs/${current_sha}/${filename}
echo "[![]($flamegraph_url)]($flamegraph_url)" >> $result_path
done
echo "" >> $result_path
Expand Down Expand Up @@ -113,4 +113,4 @@ install_s5cmd() {
wget "https://github.com/peak/s5cmd/releases/download/v2.2.2/${S5CMD_BIN}" -P $TMP_DIR
sudo dpkg -i "${TMP_DIR}/${S5CMD_BIN}"
fi
}
}

0 comments on commit 593206a

Please sign in to comment.