WIP

Author: Kobzol

.github/workflows/main.yml

@@ -1,5 +1,5 @@
 name: CI
-on: [push, pull_request]
+on: [ push ]
 env:
   RUST_BACKTRACE: 1
 jobs:
@@ -12,8 +12,7 @@ jobs:
         with:
           components: rustfmt
 
-      - name: Formatting
-        run: cargo fmt --all -- --check
+      - uses: Swatinem/rust-cache@v2
 
       - name: Test
         run: |
@@ -22,3 +21,33 @@ jobs:
           cargo build --all --locked
           cargo clippy -- --deny warnings
           cargo test --all --locked
+
+      - name: Formatting
+        run: cargo fmt --all -- --check
+
+      - name: Build website
+        run: cargo run
+        env:
+          BASE_URL: "/www.rust-lang.org/"
+
+      - name: Configure GitHub Pages
+        uses: actions/configure-pages@v5
+
+      - name: Upload website
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: html
+
+  deploy:
+    needs: [ build ]
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    permissions:
+      contents: read
+      pages: write
+      id-token: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Deploy to GitHub Pages
+        uses: actions/deploy-pages@v4

src/assets.rs

@@ -41,7 +41,7 @@ fn compile_sass(root_dir: &Path, out_dir: &Path, filename: &str) -> anyhow::Resu
     write_file(&out_css_path, &css.into_bytes())
         .with_context(|| anyhow::anyhow!("couldn't write css file: {}", out_css_path.display()))?;
 
-    Ok(relative_url(&out_css_path, &out_dir)?)
+    relative_url(&out_css_path, out_dir)
 }
 
 fn concat_files(
@@ -71,7 +71,7 @@ fn concat_files(
     write_file(Path::new(&out_file_path), concatted.as_bytes())
         .with_context(|| anyhow::anyhow!("couldn't write vendor {extension}"))?;
 
-    Ok(relative_url(&out_file_path, &out_dir)?)
+    relative_url(&out_file_path, out_dir)
 }
 
 fn concat_vendor_css(root_dir: &Path, out_dir: &Path, files: Vec<&str>) -> anyhow::Result<String> {

src/i18n.rs

@@ -5,6 +5,7 @@ use handlebars::{
 use serde::Serialize;
 use std::{collections::HashSet, sync::LazyLock};
 
+use crate::ENGLISH;
 use handlebars_fluent::{
     fluent_bundle::{FluentResource, FluentValue, concurrent::FluentBundle},
     loader::SimpleLoader,
@@ -215,7 +216,7 @@ impl HelperDef for TeamHelper {
         let team_name = team.as_json()["name"].as_str().unwrap();
 
         // English uses the team data directly, so that it gets autoupdated
-        if lang == "en-US" {
+        if lang == ENGLISH {
             let english = param.english(team.as_json());
             out.write(english)
                 .map_err(|e| RenderErrorReason::NestedError(Box::new(e)))?;

src/main.rs

@@ -1,8 +1,10 @@
+#![allow(unused)]
+
 use crate::assets::compile_assets;
 use crate::i18n::{TeamHelper, create_loader};
 use crate::redirect::create_redirects;
 use crate::render::{RenderCtx, render_directory, render_governance, render_index};
-use crate::rust_version::RustVersion;
+use crate::rust_version::fetch_rust_version;
 use crate::teams::{encode_zulip_stream, load_rust_teams};
 use anyhow::Context;
 use handlebars::{DirectorySourceOptions, Handlebars};
@@ -24,11 +26,28 @@ const ZULIP_DOMAIN: &str = "https://rust-lang.zulipchat.com";
 static LAYOUT: &str = "components/layout";
 static ENGLISH: &str = "en-US";
 
-fn baseurl(lang: &str) -> String {
-    if lang == "en-US" {
-        String::new()
-    } else {
-        format!("/{lang}")
+/// Relative base url from the root of the website
+/// `url` can be e.g. `/` or `/foo-bar/`.
+struct BaseUrl {
+    url: String,
+}
+
+impl BaseUrl {
+    fn new(url: &str) -> Self {
+        let url = if url.ends_with("/") {
+            url.to_string()
+        } else {
+            format!("{url}/")
+        };
+        Self { url }
+    }
+
+    fn resolve(&self, lang: &str) -> String {
+        if lang == ENGLISH {
+            self.url.clone()
+        } else {
+            format!("{}{lang}/", self.url)
+        }
     }
 }
 
@@ -52,6 +71,9 @@ fn setup_handlebars() -> anyhow::Result<Handlebars<'static>> {
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
+    let base_url = std::env::var("BASE_URL").unwrap_or_else(|_| "/".to_string());
+    let base_url = BaseUrl::new(&base_url);
+
     let rust_version = fetch_rust_version().await?;
     let teams = load_rust_teams().await?;
 
@@ -72,6 +94,7 @@ async fn main() -> anyhow::Result<()> {
         teams,
         handlebars,
         output_dir,
+        base_url,
     };
     ctx.copy_asset_dir("static", "static")?;
     ctx.copy_asset_file(

src/render.rs

@@ -3,7 +3,7 @@ use crate::fs::{copy_dir_all, ensure_directory};
 use crate::i18n::{EXPLICIT_LOCALE_INFO, LocaleInfo, SUPPORTED_LOCALES};
 use crate::rust_version::RustVersion;
 use crate::teams::{PageData, RustTeams};
-use crate::{ENGLISH, LAYOUT, PONTOON_ENABLED, baseurl};
+use crate::{BaseUrl, ENGLISH, LAYOUT, PONTOON_ENABLED};
 use anyhow::Context;
 use handlebars::Handlebars;
 use handlebars_fluent::{Loader, SimpleLoader};
@@ -72,6 +72,7 @@ pub struct RenderCtx<'a> {
     pub rust_version: RustVersion,
     pub teams: RustTeams,
     pub assets: AssetFiles,
+    pub base_url: BaseUrl,
 }
 
 impl<'a> RenderCtx<'a> {
@@ -95,8 +96,8 @@ impl<'a> RenderCtx<'a> {
                 parent: LAYOUT,
                 is_landing: false,
                 data,
-                baseurl: baseurl(&lang),
-                is_translation: lang != "en-US",
+                baseurl: self.base_url.resolve(lang),
+                is_translation: lang != ENGLISH,
                 lang: lang.to_string(),
                 pontoon_enabled: PONTOON_ENABLED,
                 assets: &self.assets,