From b38bd2211e6ddfde8bd0fbf7bb210ecb48f53f45 Mon Sep 17 00:00:00 2001
From: Jacob Heider <jacob@tea.xyz>
Date: Thu, 9 Mar 2023 16:44:43 -0500
Subject: [PATCH] fix(rust)

---
 projects/rust-lang.org/package.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/projects/rust-lang.org/package.yml b/projects/rust-lang.org/package.yml
index 8ffaf589..932350f2 100644
--- a/projects/rust-lang.org/package.yml
+++ b/projects/rust-lang.org/package.yml
@@ -41,12 +41,20 @@ build:
     python.org: 3
     openssl.org: '*' # needed to build openssl-sys
     freedesktop.org/pkg-config: ^0.29
+    crates.io/semverator: 0
   script: |-
     # --enable-optimize not available as of 1.63.0
-    if test {{version.major}} -eq 1 -a {{version.minor}} -lt 63; then
+    if semverator satisfies '<1.63' {{ version }}; then
       export ARGS="$ARGS --enable-optimize"
     fi
 
+    # 1.68.0 introduced a regression w.r.t. CI builds
+    # https://github.com/rust-lang/rust/issues/108959
+    if semverator satisfies ^1.68 {{ version }}; then
+      sed -i.bak -e 's/if CiEnv::is_ci() {/if CiEnv::is_ci() \&\& config.rust_info.is_managed_git_subrepository() {/' src/bootstrap/native.rs
+      rm src/bootstrap/native.rs.bak
+    fi
+
     ./configure $ARGS
     make install
 
@@ -69,7 +77,8 @@ build:
 
 test:
   script: |
-    rustc $FIXTURE -o hello
+    mv $FIXTURE hello.rs
+    rustc hello.rs
     ./hello
   fixture: |
     fn main() {