From 0da7154a4b20c173f43b997c8105e9a184a135ce Mon Sep 17 00:00:00 2001 From: Zeke Foppa Date: Tue, 19 May 2026 15:39:38 -0700 Subject: [PATCH 1/4] [bfops/aws]: Update package action to use AWS --- .github/workflows/benchmarks.yml | 9 ++++++--- .github/workflows/package.yml | 3 +-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 2785a84d95a..1a934842bfb 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -2,7 +2,6 @@ on: push: branches: - master - - jgilles/fix-callgrind-again workflow_dispatch: inputs: @@ -24,8 +23,10 @@ jobs: benchmark: name: run criterion benchmarks runs-on: benchmarks-runner + # disable until we fix the benchmarks + if: false # filter for a comment containing 'benchmarks please' - if: ${{ github.event_name != 'issue_comment' || (github.event.issue.pull_request && contains(github.event.comment.body, 'benchmarks please')) }} + #if: ${{ github.event_name != 'issue_comment' || (github.event.issue.pull_request && contains(github.event.comment.body, 'benchmarks please')) }} env: PR_NUMBER: ${{ github.event.inputs.pr_number || github.event.issue.number || null }} steps: @@ -185,8 +186,10 @@ jobs: container: image: rust:1.93.0 options: --privileged + # disable until we fix the benchmarks + if: false # filter for a comment containing 'benchmarks please' - if: ${{ github.event_name != 'issue_comment' || (github.event.issue.pull_request && contains(github.event.comment.body, 'benchmarks please')) }} + #if: ${{ github.event_name != 'issue_comment' || (github.event.issue.pull_request && contains(github.event.comment.body, 'benchmarks please')) }} env: PR_NUMBER: ${{ github.event.inputs.pr_number || github.event.issue.number || null }} steps: diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 38632014506..1aa47cb0eae 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -142,12 +142,11 @@ jobs: run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT id: extract_branch - - name: Upload to DO Spaces + - name: Upload to AWS S3 uses: shallwefootball/s3-upload-action@master with: aws_key_id: ${{ secrets.AWS_KEY_ID }} aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}} aws_bucket: ${{ vars.AWS_BUCKET }} source_dir: build - endpoint: https://nyc3.digitaloceanspaces.com destination_dir: ${{ steps.extract_branch.outputs.branch }} From a8530a6d9651d03484cbbdb515edadf5134ec87a Mon Sep 17 00:00:00 2001 From: Zeke Foppa Date: Tue, 19 May 2026 15:50:39 -0700 Subject: [PATCH 2/4] [bfops/aws]: update mirrors and attach-artifacts.yml --- .github/workflows/attach-artifacts.yml | 4 ++-- crates/update/spacetime-install.ps1 | 2 +- crates/update/spacetime-install.sh | 2 +- crates/update/src/cli/install.rs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/attach-artifacts.yml b/.github/workflows/attach-artifacts.yml index 23ad34343de..f2a78e17ed8 100644 --- a/.github/workflows/attach-artifacts.yml +++ b/.github/workflows/attach-artifacts.yml @@ -17,10 +17,10 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Download artifacts from private base URL + - name: Download artifacts from AWS base URL env: RELEASE_TAG: ${{ github.event.inputs.release_tag }} - BASE_URL: ${{ secrets.ARTIFACT_BASE_URL }} + BASE_URL: ${{ vars.ARTIFACT_BASE_URL }} run: | set -euo pipefail diff --git a/crates/update/spacetime-install.ps1 b/crates/update/spacetime-install.ps1 index c5f9ecf6c14..2ade395ca25 100644 --- a/crates/update/spacetime-install.ps1 +++ b/crates/update/spacetime-install.ps1 @@ -32,7 +32,7 @@ function Install { $AssetName = "spacetimedb-update-x86_64-pc-windows-msvc.exe" $DownloadUrl = "https://github.com/clockworklabs/SpacetimeDB/releases/latest/download/$AssetName" - $MirrorBase = "https://spacetimedb-client-binaries.nyc3.digitaloceanspaces.com" + $MirrorBase = "https://spacetimedb-client-binaries.s3.amazonaws.com" Write-Output "Downloading installer..." function UpdatePathIfNotExists { diff --git a/crates/update/spacetime-install.sh b/crates/update/spacetime-install.sh index 47d3bc60739..d171a0f5467 100644 --- a/crates/update/spacetime-install.sh +++ b/crates/update/spacetime-install.sh @@ -65,7 +65,7 @@ main() { # Define the latest SpacetimeDB download url local _asset_name="spacetimedb-update-$_host$_ext" local _url="$SPACETIME_DOWNLOAD_ROOT/$_asset_name" - local _mirror_base="https://spacetimedb-client-binaries.nyc3.digitaloceanspaces.com" + local _mirror_base="https://spacetimedb-client-binaries.s3.amazonaws.com" echo "Downloading installer..." local _ok=false if [ "$_downloader" = curl ]; then diff --git a/crates/update/src/cli/install.rs b/crates/update/src/cli/install.rs index 3a75ce84c53..c2cadb5bb3d 100644 --- a/crates/update/src/cli/install.rs +++ b/crates/update/src/cli/install.rs @@ -59,7 +59,7 @@ fn releases_url() -> String { .unwrap_or_else(|_| "https://api.github.com/repos/clockworklabs/SpacetimeDB/releases".to_owned()) } -const MIRROR_BASE_URL: &str = "https://spacetimedb-client-binaries.nyc3.digitaloceanspaces.com"; +const MIRROR_BASE_URL: &str = "https://spacetimedb-client-binaries.s3.amazonaws.com"; /// Fetch the latest version tag from the mirror. /// From 87f30b40e8321dd36668cd576e0aae0b00623f3b Mon Sep 17 00:00:00 2001 From: Zeke Foppa Date: Tue, 19 May 2026 15:55:06 -0700 Subject: [PATCH 3/4] [bfops/aws]: update --- .github/workflows/attach-artifacts.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/attach-artifacts.yml b/.github/workflows/attach-artifacts.yml index f2a78e17ed8..483dd0d3dc7 100644 --- a/.github/workflows/attach-artifacts.yml +++ b/.github/workflows/attach-artifacts.yml @@ -20,7 +20,7 @@ jobs: - name: Download artifacts from AWS base URL env: RELEASE_TAG: ${{ github.event.inputs.release_tag }} - BASE_URL: ${{ vars.ARTIFACT_BASE_URL }} + BASE_URL: https://${{ vars.AWS_BUCKET }}.s3.amazonaws.com/refs/tags run: | set -euo pipefail @@ -60,4 +60,3 @@ jobs: gh release upload "$RELEASE_TAG" ./* \ --repo "$GITHUB_REPOSITORY" \ --clobber - From 24bb48e8cbf2c1bd21763a261fbdc5d5726941ac Mon Sep 17 00:00:00 2001 From: Zeke Foppa Date: Tue, 19 May 2026 15:56:09 -0700 Subject: [PATCH 4/4] [bfops/aws]: revert --- .github/workflows/attach-artifacts.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/attach-artifacts.yml b/.github/workflows/attach-artifacts.yml index 483dd0d3dc7..90a331387fe 100644 --- a/.github/workflows/attach-artifacts.yml +++ b/.github/workflows/attach-artifacts.yml @@ -60,3 +60,4 @@ jobs: gh release upload "$RELEASE_TAG" ./* \ --repo "$GITHUB_REPOSITORY" \ --clobber +