From 0078293320bc87b6b07225050e1fac37fec9392d Mon Sep 17 00:00:00 2001
From: SergioMartin86 <eienburuu@gmail.com>
Date: Sun, 28 Apr 2024 13:59:33 +0200
Subject: [PATCH] Fixing compilation

---
 .github/workflows/make.yml | 38 ++++++++++++--------------------------
 1 file changed, 12 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml
index ee5ee5d0a51..27ca908a4db 100644
--- a/.github/workflows/make.yml
+++ b/.github/workflows/make.yml
@@ -8,8 +8,8 @@ on:
     branches: [ "upstreamCI" ]
 
 env:
-  CC: clang-16
-  CXX: clang++-16
+  CC: clang-18
+  CXX: clang++-18
 
 jobs:
 
@@ -49,40 +49,26 @@ jobs:
           waterbox/libcxx
           waterbox/sysroot
   
-  build-ares64:
+  build-waterboxed-cores:
     runs-on: ubuntu-latest
     needs: build-waterbox
     steps:
     - uses: actions/checkout@v4
-    - name: Download compiled waterbox
-      uses: actions/download-artifact@v4
       with:
-        name: compiled-waterbox
-        path: waterbox
-    - name: Giving execution permission to compiler
-      working-directory: ./waterbox/sysroot
-      run: chmod u+x bin/*
-    - name: Building Ares64 core
-      working-directory: ./waterbox/ares64
-      run: ./make-both.sh
-
-  build-gpgx:
-    runs-on: ubuntu-latest
-    needs: build-waterbox
-    steps:
-    - uses: actions/checkout@v4
+        submodules: recursive
     - name: Download compiled waterbox
       uses: actions/download-artifact@v4
       with:
         name: compiled-waterbox
         path: waterbox
+    - name: Installing clang 18
+      run: wget https://apt.llvm.org/llvm.sh;
+            chmod u+x llvm.sh;
+            sudo ./llvm.sh 18;
+            clang-18 --version;        
     - name: Giving execution permission to compiler
       working-directory: ./waterbox/sysroot
       run: chmod u+x bin/*
-    - name: Getting submodule(s)
-      working-directory: ./waterbox/gpgx
-      run: git submodule init Genesis-Plus-GX;
-           git submodule update Genesis-Plus-GX
-    - name: Building GPGX core
-      working-directory: ./waterbox/gpgx
-      run: make -j${nproc}
\ No newline at end of file
+    - name: Building cores
+      working-directory: ./waterbox/
+      run: ./make-all-cores.sh
\ No newline at end of file