Page MenuHomePhabricator
Differential D14413

Upgrade to Rust 1.85
ClosedPublic
Actions

Authored by ashoat on Feb 26 2025, 12:14 AM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Apr 1, 9:33 AM
Unknown Object (File)
Mon, Mar 31, 9:53 PM
Unknown Object (File)
Mon, Mar 31, 6:54 PM
Unknown Object (File)
Mon, Mar 31, 3:42 PM
Unknown Object (File)
Mon, Mar 31, 2:38 AM
Unknown Object (File)
Sun, Mar 30, 10:23 PM
Unknown Object (File)
Sun, Mar 30, 11:34 AM
Unknown Object (File)
Sun, Mar 16, 1:01 PM
View All 51 Files
Subscribers
tomek

Details

Reviewers
bartek
kamil
Commits
rCOMM67fde31e015d: Upgrade to Rust 1.85
Summary

This addresses ENG-10270.

Changes here:

  1. Upgrade everything to Rust 1.85.
  2. In order to address ENG-9892:
    • We need to bump our Webpack version (see here).
    • We also need to use a higher version of binaryen than the one we're getting from apt-get, so I introduced a script to download a later version binary.
    • Finally, we need to pass --reference-types to wasm-pack.
Test Plan
  1. Confirmed CI passes
  2. Confirmed I can build the keyserver Docker image locally on my macOS device
  3. On my personal server, built the keyserver Docker image and deployed a web app publicly at https://comm.software/, which is connected to my authoritative keyserver on AWS (running the earlier keyserver image 153). Played around with it a bit, including logged out and back in via QR code.

Diff Detail

Repository
rCOMM Comm
Branch
master
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

ashoat created this revision.Feb 26 2025, 12:14 AM
ashoat held this revision as a draft.
Herald added a subscriber: tomek. · View Herald TranscriptFeb 26 2025, 12:14 AM
ashoat updated this revision to Diff 47280.Feb 26 2025, 12:34 AM

Bump Webpack (see here)

Harbormaster failed remote builds in B33634: Diff 47280!Feb 26 2025, 12:47 AM
ashoat updated this revision to Diff 47281.Feb 26 2025, 12:57 AM

Try adding --reference-types to web/scripts/run-wasmpack.sh

ashoat updated this revision to Diff 47283.Feb 26 2025, 1:59 PM

Install a later version of binaryen

Harbormaster completed remote builds in B33637: Diff 47283.Feb 26 2025, 2:44 PM
ashoat published this revision for review.Feb 26 2025, 2:44 PM
ashoat edited the test plan for this revision. (Show Details)Feb 26 2025, 10:38 PM
ashoat edited the summary of this revision. (Show Details)Feb 26 2025, 10:42 PM
ashoat edited the summary of this revision. (Show Details)

I'm not entirely sure what functionality I should be testing to verify that backup-client-wasm still works correctly on web. If reviewers have any context here, please feel free to test that functionality on https://comm.software/

bartek accepted this revision.EditedFeb 27 2025, 1:46 AM

Rust update looks good to me

In D14413#400481, @ashoat wrote:

I'm not entirely sure what functionality I should be testing to verify that backup-client-wasm still works correctly on web. If reviewers have any context here, please feel free to test that functionality on https://comm.software/

As long as it compiles and web runs, it should be okay.
The only place this is used on web is Settings -> Account Settings -> Backup menu -> Test restore backup, but I'm unsure where to get correct values from and if this code is even supposed to work at this moment. cc @kamil
At this moment it fails this way, likely because https://comm.software isn't added to CORS config on services (created ENG-10272):

Screenshot 2025-02-27 at 10.27.11.png (1×1 px, 267 KB)

This revision is now accepted and ready to land.Feb 27 2025, 1:46 AM
bartek attached a referenced file: F4398714: Screenshot 2025-02-27 at 10.27.11.png. (Show Details)Feb 27 2025, 1:46 AM
ashoat added a comment.Feb 27 2025, 8:57 AM

Okay, in order to fix CI and unblock the builds, I'll go ahead and land this on the assumption that things are working. I've created a task to confirm that it's working once things are deployed in production; assigned to @bartek for now since @kamil is out sick.

Closed by commit rCOMM67fde31e015d: Upgrade to Rust 1.85 (authored by ashoat). · Explain WhyFeb 27 2025, 8:58 AM
This revision was automatically updated to reflect the committed changes.
ashoat added a commit: rCOMM67fde31e015d: Upgrade to Rust 1.85.
bartek mentioned this in D14422: [comm-lib] Add comm.software to CORS config.Feb 28 2025, 1:35 AM
bartek mentioned this in rCOMMdc964512859e: [comm-lib] Add comm.software to CORS config.Mar 3 2025, 1:43 AM

Revision Contents
Changeset List

PathSize
keyserver/
2 lines
lib/
2 lines
2 lines
services/
backup/
2 lines
blob/
2 lines
commtest/
2 lines
feature-flags/
2 lines
identity/
2 lines
reports/
2 lines
tunnelbroker/
2 lines
404 lines

Diff 47280

View Options

keyserver/Dockerfile

Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Lines
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# STEP 4: SET UP CARGO (RUST PACKAGE MANAGER) # STEP 4: SET UP CARGO (RUST PACKAGE MANAGER)
# We use Cargo to build pre-compiled Node.js addons in Rust # We use Cargo to build pre-compiled Node.js addons in Rust
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Install Rust and add Cargo's bin directory to the $PATH environment variable # Install Rust and add Cargo's bin directory to the $PATH environment variable
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
--default-toolchain 1.81 --default-toolchain 1.85
ENV PATH /home/comm/.cargo/bin:$PATH ENV PATH /home/comm/.cargo/bin:$PATH
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# STEP 5: SET UP NVM # STEP 5: SET UP NVM
# We use nvm to make sure we're running the right Node version # We use nvm to make sure we're running the right Node version
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# First we install nvm # First we install nvm
▲ Show 20 Lines • Show All 131 Lines • Show Last 20 Lines
View Options

lib/package.json

Show All 26 Lines "devDependencies": {
"css-minimizer-webpack-plugin": "^4.2.2", "css-minimizer-webpack-plugin": "^4.2.2",
"flow-bin": "^0.202.1", "flow-bin": "^0.202.1",
"flow-typed": "^3.2.1", "flow-typed": "^3.2.1",
"jest": "^29.7.0", "jest": "^29.7.0",
"mini-css-extract-plugin": "^2.7.2", "mini-css-extract-plugin": "^2.7.2",
"react-refresh": "^0.14.0", "react-refresh": "^0.14.0",
"style-loader": "^3.3.1", "style-loader": "^3.3.1",
"terser-webpack-plugin": "^5.3.6", "terser-webpack-plugin": "^5.3.6",
"webpack": "^5.76.0" "webpack": "^5.98.0"
}, },
"dependencies": { "dependencies": {
"@commapp/olm": "0.2.1", "@commapp/olm": "0.2.1",
"@ensdomains/ensjs": "^4.0.1", "@ensdomains/ensjs": "^4.0.1",
"@rainbow-me/rainbowkit": "^2.0.7", "@rainbow-me/rainbowkit": "^2.0.7",
"base-64": "^0.1.0", "base-64": "^0.1.0",
"dateformat": "^3.0.3", "dateformat": "^3.0.3",
"emoji-regex": "^10.2.1", "emoji-regex": "^10.2.1",
Show All 40 Lines
View Options

rust-toolchain.toml

[toolchain] [toolchain]
channel = "1.81" channel = "1.85"
profile = "default" profile = "default"
View Options

services/backup/Dockerfile

FROM rust:1.81-bullseye as builder FROM rust:1.85-bullseye as builder
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
build-essential cmake git libgtest-dev libssl-dev zlib1g-dev \ build-essential cmake git libgtest-dev libssl-dev zlib1g-dev \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
WORKDIR /home/root/services/backup WORKDIR /home/root/services/backup
# Install more recent version of protobuf, must be ran as root # Install more recent version of protobuf, must be ran as root
Show All 36 Lines
View Options

services/blob/Dockerfile

Loading...
View Options

services/commtest/Dockerfile

Loading...
View Options

services/feature-flags/Dockerfile

Loading...
View Options

services/identity/Dockerfile

Loading...
View Options

services/reports/Dockerfile

Loading...
View Options

services/tunnelbroker/Dockerfile

Loading...
View Options

yarn.lock

Loading...