fix(ci): env var cleanup, wget aarch64 musl, fetch depth 1

sedaprotocol · Oct 11, 2024 · e9068c4 · e9068c4
1 parent e050368
commit e9068c4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
@@ -7,7 +7,7 @@ on:
         required: true
       architecture:
         required: true
-        description: 'The architecture to build for'
+        description: "The architecture to build for"
         type: choice
         options:
           - all
@@ -17,7 +17,7 @@ on:
           - static-x86-64
       debug:
         required: false
-        description: 'Enable debug mode'
+        description: "Enable debug mode"
         type: boolean
         default: false
 
@@ -50,7 +50,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0
+          fetch-depth: 1
 
       - name: 🫙 Cache
         uses: Swatinem/rust-cache@v2
@@ -73,13 +73,13 @@ jobs:
           cargo xtask compile ${{ github.event.inputs.architecture }} --debug
 
       - name: 🔨 Build Library For ${{ github.event.inputs.architecture }}
-        if:  ${{ github.event.inputs.debug == 'false' }}
+        if: ${{ github.event.inputs.debug == 'false' }}
         run: |
           cargo xtask compile ${{ github.event.inputs.architecture }}
 
       - name: 📝 Set Branch Name
         id: set_branch
-        run:  echo "FORMATTED_REF=${{ github.ref }}" | sed 's/\//-/g' >> $GITHUB_OUTPUT
+        run: echo "FORMATTED_REF=${{ github.ref }}" | sed 's/\//-/g' >> $GITHUB_OUTPUT
 
       - name: 📤 Upload Artifacts
         uses: actions/upload-artifact@v4

diff --git a/xtask/src/main.rs b/xtask/src/main.rs
@@ -57,9 +57,17 @@ struct AptInstall {
 }
 
 impl AptInstall {
+    fn install_aarch64_musl_gcc(sh: &Shell) -> Result<()> {
+        cmd!(sh, "wget https://musl.cc/aarch64-linux-musl-cross.tgz").run()?;
+        cmd!(sh, "tar -xvf aarch64-linux-musl-cross.tgz").run()?;
+        cmd!(sh, "sudo mv aarch64-linux-musl-cross /opt").run()?;
+        Ok(())
+    }
+
     fn handle(self, sh: &Shell) -> Result<()> {
         match self.arch {
             Arch::All => {
+                Self::install_aarch64_musl_gcc(sh)?;
                 cmd!(
                     sh,
                     "sudo apt-get install -y clang llvm gcc-aarch64-linux-gnu qemu-user-static musl-tools"
@@ -77,6 +85,7 @@ impl AptInstall {
                 cmd!(sh, "sudo apt-get install -y clang llvm").run()?;
             }
             Arch::StaticAarch64 => {
+                Self::install_aarch64_musl_gcc(sh)?;
                 cmd!(sh, "sudo apt-get install -y musl-tools").run()?;
             }
             Arch::StaticX86_64 => {
@@ -100,6 +109,7 @@ struct Compile {
     debug: bool,
     arch:  Arch,
 }
+
 impl Compile {
     fn handle(self, sh: &Shell) -> Result<()> {
         if let Arch::All = self.arch {
@@ -159,6 +169,8 @@ impl Compile {
             target_dir.join(target).join(path).join(arch.filename()),
             target_dir.join(rename),
         )?;
+        std::env::remove_var("CC");
+        std::env::remove_var("CXX");
         Ok(())
     }
 }