From 8f8a58c5fece64cfd156fd5915ba371d706de867 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduardo=20Leegwater=20Sim=C3=B5es?= <eduardo@dusk.network>
Date: Thu, 17 Oct 2024 18:20:47 +0200
Subject: [PATCH] workflow FIXUP

---
 .github/workflows/dusk.yml | 30 +++++++++++++++++++++++-------
 config.template.toml       | 17 +++++++++++------
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/dusk.yml b/.github/workflows/dusk.yml
index a178a592467ce..0c375349b2bb0 100644
--- a/.github/workflows/dusk.yml
+++ b/.github/workflows/dusk.yml
@@ -26,6 +26,7 @@ jobs:
             target: x86_64-apple-darwin
           - os: macos-latest-xlarge
             target: aarch64-apple-darwin
+
     runs-on: ${{ matrix.os }}
     steps:
       - name: Check out repository
@@ -33,21 +34,36 @@ jobs:
         with:
           fetch-depth: 16
 
-      - name: Setup dependencies
+      - name: Setup dependencies (x86_64-linux)
         if: matrix.os == 'ubuntu-latest'
-        run: sudo apt update && sudo apt install -y ninja-build
+        run: |
+          sudo apt update && \
+          sudo apt install -y ninja-build && \
+          touch .env
+
+      - name: Setup dependencies (x86_64-apple)
+        if: startsWith(matrix.target, 'x86_64-apple')
+        run: |
+          brew install ninja llvm lld &&
+          echo 'export PATH="/usr/local/opt/llvm/bin:$PATH"'     >> .env &&
+          echo 'export LDFLAGS="-L/usr/local/opt/llvm/lib"'      >> .env &&
+          echo 'export CPPFLAGS="-I/usr/local/opt/llvm/include"' >> .env
 
-      - name: Setup dependencies
-        if: startsWith(matrix.os, 'macos')
+      - name: Setup dependencies (aarch64-apple)
+        if: startsWith(matrix.target, 'aarch64-apple')
         run: |
-          brew install ninja gettext &&
-          brew link --force gettext
+          brew install ninja llvm lld &&
+          echo 'export PATH="/opt/homebrew/opt/llvm/bin:$PATH"'     >> .env &&
+          echo 'export LDFLAGS="-L/opt/homebrew/opt/llvm/lib"'      >> .env &&
+          echo 'export CPPFLAGS="-I/opt/homebrew/opt/llvm/include"' >> .env
+
       - name: Generate configuration
         run: |
           HOST=${{ matrix.target }} envsubst < config.template.toml > config.toml &&
           cat config.toml
+
       - name: Run build
-        run: ./x.py dist
+        run: source .env && ./x.py dist
 
       - name: Set artifact name
         id: artifact-name
diff --git a/config.template.toml b/config.template.toml
index 8fd0d693a60a3..b9b4be6a4c932 100644
--- a/config.template.toml
+++ b/config.template.toml
@@ -1,25 +1,30 @@
 change-id = 131075
 
-[llvm]
-download-ci-llvm = false
-clang = true
-
 [build]
-host = [ "${HOST}" ]
+build-stage = 2
+test-stage = 2
+doc-stage = 2
+
 target = [
     "${HOST}",
     "wasm32-unknown-unknown",
     "wasm64-unknown-unknown"
 ]
-docs = false
+
 extended = true
 
+[llvm]
+download-ci-llvm = false
+
 [rust]
 channel = "nightly"
 description = "Dusk Network's Smart Contract Compiler"
 
+download-rustc = false
 lld = true
 
+llvm-bitcode-linker = true
+
 [dist]
 compression-formats = ["gz"]
 compression-profile = "best"