Skip to content

Commit 8641c17

Browse files
authored
Client binaries from DigitalOcean -> AWS (#5077)
# Description of Changes Use an AWS bucket for client binaries instead of DigitalOcean. Note that this will effectively hamstring the DigitalOcean mirror for any old clients (i.e. ones before this change is released). But it's only a mirror, and they can "fix" it by upgrading to a version with this change. # API and ABI breaking changes None # Expected complexity level and risk 1 # Testing - [x] Manually ran the package job on this PR and confirmed that some of the resulting URLs are indeed downloadable from the AWS urls --------- Co-authored-by: Zeke Foppa <bfops@users.noreply.github.com>
1 parent 868f65f commit 8641c17

6 files changed

Lines changed: 12 additions & 10 deletions

File tree

.github/workflows/attach-artifacts.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
- name: Checkout
1818
uses: actions/checkout@v4
1919

20-
- name: Download artifacts from private base URL
20+
- name: Download artifacts from AWS base URL
2121
env:
2222
RELEASE_TAG: ${{ github.event.inputs.release_tag }}
23-
BASE_URL: ${{ secrets.ARTIFACT_BASE_URL }}
23+
BASE_URL: https://${{ vars.AWS_BUCKET }}.s3.amazonaws.com/refs/tags
2424
run: |
2525
set -euo pipefail
2626

.github/workflows/benchmarks.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ on:
22
push:
33
branches:
44
- master
5-
- jgilles/fix-callgrind-again
65

76
workflow_dispatch:
87
inputs:
@@ -24,8 +23,10 @@ jobs:
2423
benchmark:
2524
name: run criterion benchmarks
2625
runs-on: benchmarks-runner
26+
# disable until we fix the benchmarks
27+
if: false
2728
# filter for a comment containing 'benchmarks please'
28-
if: ${{ github.event_name != 'issue_comment' || (github.event.issue.pull_request && contains(github.event.comment.body, 'benchmarks please')) }}
29+
#if: ${{ github.event_name != 'issue_comment' || (github.event.issue.pull_request && contains(github.event.comment.body, 'benchmarks please')) }}
2930
env:
3031
PR_NUMBER: ${{ github.event.inputs.pr_number || github.event.issue.number || null }}
3132
steps:
@@ -185,8 +186,10 @@ jobs:
185186
container:
186187
image: rust:1.93.0
187188
options: --privileged
189+
# disable until we fix the benchmarks
190+
if: false
188191
# filter for a comment containing 'benchmarks please'
189-
if: ${{ github.event_name != 'issue_comment' || (github.event.issue.pull_request && contains(github.event.comment.body, 'benchmarks please')) }}
192+
#if: ${{ github.event_name != 'issue_comment' || (github.event.issue.pull_request && contains(github.event.comment.body, 'benchmarks please')) }}
190193
env:
191194
PR_NUMBER: ${{ github.event.inputs.pr_number || github.event.issue.number || null }}
192195
steps:

.github/workflows/package.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,11 @@ jobs:
142142
run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
143143
id: extract_branch
144144

145-
- name: Upload to DO Spaces
145+
- name: Upload to AWS S3
146146
uses: shallwefootball/s3-upload-action@master
147147
with:
148148
aws_key_id: ${{ secrets.AWS_KEY_ID }}
149149
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
150150
aws_bucket: ${{ vars.AWS_BUCKET }}
151151
source_dir: build
152-
endpoint: https://nyc3.digitaloceanspaces.com
153152
destination_dir: ${{ steps.extract_branch.outputs.branch }}

crates/update/spacetime-install.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function Install {
3232

3333
$AssetName = "spacetimedb-update-x86_64-pc-windows-msvc.exe"
3434
$DownloadUrl = "https://github.com/clockworklabs/SpacetimeDB/releases/latest/download/$AssetName"
35-
$MirrorBase = "https://spacetimedb-client-binaries.nyc3.digitaloceanspaces.com"
35+
$MirrorBase = "https://spacetimedb-client-binaries.s3.amazonaws.com"
3636
Write-Output "Downloading installer..."
3737

3838
function UpdatePathIfNotExists {

crates/update/spacetime-install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ main() {
6565
# Define the latest SpacetimeDB download url
6666
local _asset_name="spacetimedb-update-$_host$_ext"
6767
local _url="$SPACETIME_DOWNLOAD_ROOT/$_asset_name"
68-
local _mirror_base="https://spacetimedb-client-binaries.nyc3.digitaloceanspaces.com"
68+
local _mirror_base="https://spacetimedb-client-binaries.s3.amazonaws.com"
6969
echo "Downloading installer..."
7070
local _ok=false
7171
if [ "$_downloader" = curl ]; then

crates/update/src/cli/install.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fn releases_url() -> String {
5959
.unwrap_or_else(|_| "https://api.github.com/repos/clockworklabs/SpacetimeDB/releases".to_owned())
6060
}
6161

62-
const MIRROR_BASE_URL: &str = "https://spacetimedb-client-binaries.nyc3.digitaloceanspaces.com";
62+
const MIRROR_BASE_URL: &str = "https://spacetimedb-client-binaries.s3.amazonaws.com";
6363

6464
/// Fetch the latest version tag from the mirror.
6565
///

0 commit comments

Comments
 (0)