From d12503ffa03f692ab99b6836e8e17f11e3d153d6 Mon Sep 17 00:00:00 2001 From: Mason M Date: Mon, 7 Apr 2025 14:20:54 -0300 Subject: [PATCH 01/17] Continue on error during setup --- .github/workflows/build-linux-cross.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-linux-cross.yml b/.github/workflows/build-linux-cross.yml index e8639913ea3a6..b05d88c11e457 100644 --- a/.github/workflows/build-linux-cross.yml +++ b/.github/workflows/build-linux-cross.yml @@ -10,6 +10,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Setup Riscv + continue-on-error: true run: | sudo dpkg --add-architecture riscv64 sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \ @@ -49,6 +50,7 @@ jobs: fetch-depth: 0 - name: Setup Riscv + continue-on-error: true run: | sudo dpkg --add-architecture riscv64 sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \ @@ -91,6 +93,7 @@ jobs: fetch-depth: 0 - name: Setup Arm64 + continue-on-error: true run: | sudo dpkg --add-architecture arm64 sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \ From 54d4f14d905aa9733b9d02836f85d7c3684002dc Mon Sep 17 00:00:00 2001 From: Mason M Date: Mon, 7 Apr 2025 14:51:34 -0300 Subject: [PATCH 02/17] Add whitespace to force ci build --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 33f6a4fb483ed..b01d031a16f5c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -604,6 +604,7 @@ jobs: build-linux-cross: uses: ./.github/workflows/build-linux-cross.yml + macOS-latest-cmake-ios: runs-on: macos-latest From 20155ff20082746f86a002d8c50ce35e90ef6bcd Mon Sep 17 00:00:00 2001 From: Mason M Date: Mon, 7 Apr 2025 16:12:32 -0300 Subject: [PATCH 03/17] Revert whitespace change --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b01d031a16f5c..33f6a4fb483ed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -604,7 +604,6 @@ jobs: build-linux-cross: uses: ./.github/workflows/build-linux-cross.yml - macOS-latest-cmake-ios: runs-on: macos-latest From 319a9505bacda54035b9b164fc8eb078e9ada2c5 Mon Sep 17 00:00:00 2001 From: Mason M Date: Mon, 7 Apr 2025 16:22:26 -0300 Subject: [PATCH 04/17] Undo the undo --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 33f6a4fb483ed..b01d031a16f5c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -604,6 +604,7 @@ jobs: build-linux-cross: uses: ./.github/workflows/build-linux-cross.yml + macOS-latest-cmake-ios: runs-on: macos-latest From 5e875baafe782b8b5167ff4ff5dbeb4ae3508c7b Mon Sep 17 00:00:00 2001 From: Mason M Date: Tue, 8 Apr 2025 14:21:52 -0300 Subject: [PATCH 05/17] Cache packages in toolchain --- .github/workflows/build-linux-cross.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-linux-cross.yml b/.github/workflows/build-linux-cross.yml index b05d88c11e457..dbf7338db1e5e 100644 --- a/.github/workflows/build-linux-cross.yml +++ b/.github/workflows/build-linux-cross.yml @@ -9,19 +9,21 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Setup Riscv - continue-on-error: true + - name: Setup ports run: | sudo dpkg --add-architecture riscv64 sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \ /etc/apt/sources.list /etc/apt/apt-mirrors.txt - sudo apt-get clean - sudo apt-get update - sudo apt-get install -y --no-install-recommends \ - build-essential \ - gcc-14-riscv64-linux-gnu \ - g++-14-riscv64-linux-gnu \ - libcurl4-openssl-dev:riscv64 + + - name: Setup toolchain + uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: > + build-essential + gcc-14-riscv64-linux-gnu + g++-14-riscv64-linux-gnu + libcurl4-openssl-dev:riscv64 + version: 1.0 - name: Build run: | @@ -50,7 +52,6 @@ jobs: fetch-depth: 0 - name: Setup Riscv - continue-on-error: true run: | sudo dpkg --add-architecture riscv64 sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \ @@ -93,7 +94,6 @@ jobs: fetch-depth: 0 - name: Setup Arm64 - continue-on-error: true run: | sudo dpkg --add-architecture arm64 sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \ From 230ef3cc67ae5b0e2b7b19756695aaccfaa2f859 Mon Sep 17 00:00:00 2001 From: Mason M Date: Tue, 8 Apr 2025 14:49:38 -0300 Subject: [PATCH 06/17] Cache packages in toolchain --- .github/workflows/build-linux-cross.yml | 49 ++++++++++++++----------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build-linux-cross.yml b/.github/workflows/build-linux-cross.yml index dbf7338db1e5e..3aa340bed6925 100644 --- a/.github/workflows/build-linux-cross.yml +++ b/.github/workflows/build-linux-cross.yml @@ -9,7 +9,7 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Setup ports + - name: Setup port run: | sudo dpkg --add-architecture riscv64 sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \ @@ -22,7 +22,7 @@ jobs: build-essential gcc-14-riscv64-linux-gnu g++-14-riscv64-linux-gnu - libcurl4-openssl-dev:riscv64 + "libcurl4-openssl-dev:riscv64" version: 1.0 - name: Build @@ -51,20 +51,23 @@ jobs: with: fetch-depth: 0 - - name: Setup Riscv + - name: Setup port run: | sudo dpkg --add-architecture riscv64 sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \ /etc/apt/sources.list /etc/apt/apt-mirrors.txt - sudo apt-get clean - sudo apt-get update - sudo apt-get install -y --no-install-recommends \ - build-essential \ - glslc \ - gcc-14-riscv64-linux-gnu \ - g++-14-riscv64-linux-gnu \ - libvulkan-dev:riscv64 \ - libcurl4-openssl-dev:riscv64 + + - name: Setup toolchain + uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: > + build-essential + glslc + gcc-14-riscv64-linux-gnu + g++-14-riscv64-linux-gnu + "libvulkan-dev:riscv64" + "libcurl4-openssl-dev:riscv64" + version: 1.0 - name: Build run: | @@ -93,19 +96,21 @@ jobs: with: fetch-depth: 0 - - name: Setup Arm64 - run: | + - name: Setup port sudo dpkg --add-architecture arm64 sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \ /etc/apt/sources.list /etc/apt/apt-mirrors.txt - sudo apt-get clean - sudo apt-get update - sudo apt-get install -y --no-install-recommends \ - build-essential \ - glslc \ - crossbuild-essential-arm64 \ - libvulkan-dev:arm64 \ - libcurl4-openssl-dev:arm64 + + - name: Setup toolchain + uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: > + build-essential + glslc + crossbuild-essential-arm64 + "libvulkan-dev:arm64" + "libcurl4-openssl-dev:arm64" + version: 1.0 - name: Build run: | From e7b756c0ee52d75569713829d1335a80caacac83 Mon Sep 17 00:00:00 2001 From: bandoti <141645996+bandoti@users.noreply.github.com> Date: Tue, 8 Apr 2025 15:07:46 -0300 Subject: [PATCH 07/17] Add space to force CI build --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b01d031a16f5c..6ecb98c2ceeeb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -605,6 +605,7 @@ jobs: uses: ./.github/workflows/build-linux-cross.yml + macOS-latest-cmake-ios: runs-on: macos-latest From 550637615a8e06312ce5c767d6c14b0e43033c16 Mon Sep 17 00:00:00 2001 From: Mason M Date: Fri, 18 Apr 2025 15:28:37 -0300 Subject: [PATCH 08/17] Hopefully this triggers the CI --- examples/main/main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/main/main.cpp b/examples/main/main.cpp index fd7410a646c69..13d40a8381033 100644 --- a/examples/main/main.cpp +++ b/examples/main/main.cpp @@ -15,6 +15,7 @@ #include #include + #if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__)) #include #include From 3f95902e8ff30e0eaf4cbe64250cdc2a8ffe2034 Mon Sep 17 00:00:00 2001 From: Mason M Date: Fri, 18 Apr 2025 15:38:54 -0300 Subject: [PATCH 09/17] Fix run command --- .github/workflows/build-linux-cross.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-linux-cross.yml b/.github/workflows/build-linux-cross.yml index 3aa340bed6925..e3d40f110ffc0 100644 --- a/.github/workflows/build-linux-cross.yml +++ b/.github/workflows/build-linux-cross.yml @@ -97,6 +97,7 @@ jobs: fetch-depth: 0 - name: Setup port + run: | sudo dpkg --add-architecture arm64 sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \ /etc/apt/sources.list /etc/apt/apt-mirrors.txt From 63fc231990c5de799991c77e27f7d87d9ec7d2cc Mon Sep 17 00:00:00 2001 From: Mason M Date: Fri, 18 Apr 2025 16:49:22 -0300 Subject: [PATCH 10/17] Call apt-get update after adding ports repo --- .github/workflows/build-linux-cross.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-linux-cross.yml b/.github/workflows/build-linux-cross.yml index e3d40f110ffc0..4514994fac4b7 100644 --- a/.github/workflows/build-linux-cross.yml +++ b/.github/workflows/build-linux-cross.yml @@ -14,6 +14,8 @@ jobs: sudo dpkg --add-architecture riscv64 sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \ /etc/apt/sources.list /etc/apt/apt-mirrors.txt + sudo apt-get clean + sudo apt-get update - name: Setup toolchain uses: awalsh128/cache-apt-pkgs-action@latest @@ -22,7 +24,7 @@ jobs: build-essential gcc-14-riscv64-linux-gnu g++-14-riscv64-linux-gnu - "libcurl4-openssl-dev:riscv64" + libcurl4-openssl-dev:riscv64 version: 1.0 - name: Build @@ -56,6 +58,8 @@ jobs: sudo dpkg --add-architecture riscv64 sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \ /etc/apt/sources.list /etc/apt/apt-mirrors.txt + sudo apt-get clean + sudo apt-get update - name: Setup toolchain uses: awalsh128/cache-apt-pkgs-action@latest @@ -65,8 +69,8 @@ jobs: glslc gcc-14-riscv64-linux-gnu g++-14-riscv64-linux-gnu - "libvulkan-dev:riscv64" - "libcurl4-openssl-dev:riscv64" + libvulkan-dev:riscv64 + libcurl4-openssl-dev:riscv64 version: 1.0 - name: Build @@ -101,6 +105,8 @@ jobs: sudo dpkg --add-architecture arm64 sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \ /etc/apt/sources.list /etc/apt/apt-mirrors.txt + sudo apt-get clean + sudo apt-get update - name: Setup toolchain uses: awalsh128/cache-apt-pkgs-action@latest @@ -109,8 +115,8 @@ jobs: build-essential glslc crossbuild-essential-arm64 - "libvulkan-dev:arm64" - "libcurl4-openssl-dev:arm64" + libvulkan-dev:arm64 + libcurl4-openssl-dev:arm64 version: 1.0 - name: Build From 55d966d6f9367f8bd8a4c4eec903e932b106c003 Mon Sep 17 00:00:00 2001 From: Mason M Date: Fri, 18 Apr 2025 17:08:59 -0300 Subject: [PATCH 11/17] Try something new with the sources --- .github/workflows/build-linux-cross.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-linux-cross.yml b/.github/workflows/build-linux-cross.yml index 4514994fac4b7..797e63974fca7 100644 --- a/.github/workflows/build-linux-cross.yml +++ b/.github/workflows/build-linux-cross.yml @@ -12,9 +12,9 @@ jobs: - name: Setup port run: | sudo dpkg --add-architecture riscv64 - sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \ - /etc/apt/sources.list /etc/apt/apt-mirrors.txt - sudo apt-get clean + sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' /etc/apt/sources.list + sudo find /etc/apt/sources.list.d -type f -exec \ + sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' {} + sudo apt-get update - name: Setup toolchain @@ -56,9 +56,9 @@ jobs: - name: Setup port run: | sudo dpkg --add-architecture riscv64 - sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \ - /etc/apt/sources.list /etc/apt/apt-mirrors.txt - sudo apt-get clean + sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' /etc/apt/sources.list + sudo find /etc/apt/sources.list.d -type f -exec \ + sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' {} + sudo apt-get update - name: Setup toolchain @@ -103,9 +103,9 @@ jobs: - name: Setup port run: | sudo dpkg --add-architecture arm64 - sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \ - /etc/apt/sources.list /etc/apt/apt-mirrors.txt - sudo apt-get clean + sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' /etc/apt/sources.list + sudo find /etc/apt/sources.list.d -type f -exec \ + sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' {} + sudo apt-get update - name: Setup toolchain From 4a43616ac93e7bf5baaf033f2f4b357566d22daa Mon Sep 17 00:00:00 2001 From: Mason M Date: Wed, 30 Apr 2025 12:51:30 -0300 Subject: [PATCH 12/17] Revert apt cache actions --- .github/workflows/build-linux-cross.yml | 64 +++++++++++-------------- 1 file changed, 28 insertions(+), 36 deletions(-) diff --git a/.github/workflows/build-linux-cross.yml b/.github/workflows/build-linux-cross.yml index 3aa340bed6925..e8639913ea3a6 100644 --- a/.github/workflows/build-linux-cross.yml +++ b/.github/workflows/build-linux-cross.yml @@ -9,21 +9,18 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Setup port + - name: Setup Riscv run: | sudo dpkg --add-architecture riscv64 sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \ /etc/apt/sources.list /etc/apt/apt-mirrors.txt - - - name: Setup toolchain - uses: awalsh128/cache-apt-pkgs-action@latest - with: - packages: > - build-essential - gcc-14-riscv64-linux-gnu - g++-14-riscv64-linux-gnu - "libcurl4-openssl-dev:riscv64" - version: 1.0 + sudo apt-get clean + sudo apt-get update + sudo apt-get install -y --no-install-recommends \ + build-essential \ + gcc-14-riscv64-linux-gnu \ + g++-14-riscv64-linux-gnu \ + libcurl4-openssl-dev:riscv64 - name: Build run: | @@ -51,23 +48,20 @@ jobs: with: fetch-depth: 0 - - name: Setup port + - name: Setup Riscv run: | sudo dpkg --add-architecture riscv64 sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \ /etc/apt/sources.list /etc/apt/apt-mirrors.txt - - - name: Setup toolchain - uses: awalsh128/cache-apt-pkgs-action@latest - with: - packages: > - build-essential - glslc - gcc-14-riscv64-linux-gnu - g++-14-riscv64-linux-gnu - "libvulkan-dev:riscv64" - "libcurl4-openssl-dev:riscv64" - version: 1.0 + sudo apt-get clean + sudo apt-get update + sudo apt-get install -y --no-install-recommends \ + build-essential \ + glslc \ + gcc-14-riscv64-linux-gnu \ + g++-14-riscv64-linux-gnu \ + libvulkan-dev:riscv64 \ + libcurl4-openssl-dev:riscv64 - name: Build run: | @@ -96,21 +90,19 @@ jobs: with: fetch-depth: 0 - - name: Setup port + - name: Setup Arm64 + run: | sudo dpkg --add-architecture arm64 sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \ /etc/apt/sources.list /etc/apt/apt-mirrors.txt - - - name: Setup toolchain - uses: awalsh128/cache-apt-pkgs-action@latest - with: - packages: > - build-essential - glslc - crossbuild-essential-arm64 - "libvulkan-dev:arm64" - "libcurl4-openssl-dev:arm64" - version: 1.0 + sudo apt-get clean + sudo apt-get update + sudo apt-get install -y --no-install-recommends \ + build-essential \ + glslc \ + crossbuild-essential-arm64 \ + libvulkan-dev:arm64 \ + libcurl4-openssl-dev:arm64 - name: Build run: | From 4fadc46c72cd817f0cf65b234fb605a78a5790a7 Mon Sep 17 00:00:00 2001 From: Mason M Date: Wed, 30 Apr 2025 12:56:57 -0300 Subject: [PATCH 13/17] Explicitly set ports list --- .github/workflows/build-linux-cross.yml | 24 ++++++++++++++++++++---- .github/workflows/build.yml | 6 ++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-linux-cross.yml b/.github/workflows/build-linux-cross.yml index e8639913ea3a6..db3b74bb545b1 100644 --- a/.github/workflows/build-linux-cross.yml +++ b/.github/workflows/build-linux-cross.yml @@ -5,16 +5,32 @@ on: jobs: ubuntu-latest-riscv64-cpu-cross: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - name: Setup Riscv run: | sudo dpkg --add-architecture riscv64 - sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \ - /etc/apt/sources.list /etc/apt/apt-mirrors.txt - sudo apt-get clean + + # Create a new sources.list with explicit architecture handling + cat << EOF | sudo tee /etc/apt/sources.list + # Standard repositories for amd64 only + deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble main restricted universe multiverse + deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble-updates main restricted universe multiverse + deb [arch=amd64] http://security.ubuntu.com/ubuntu/ noble-security main restricted universe multiverse + deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble-backports main restricted universe multiverse + EOF + + # Add arch-specific repositories for non-amd64 architectures + cat << EOF | sudo tee /etc/apt/sources.list.d/riscv64-ports.list + deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ noble main restricted universe multiverse + deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ noble-updates main restricted universe multiverse + deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ noble-security main restricted universe multiverse + deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ noble-backports main restricted universe multiverse + EOF + fi + sudo apt-get update sudo apt-get install -y --no-install-recommends \ build-essential \ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c294e10447475..34417985d2399 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -601,10 +601,8 @@ jobs: -DGGML_SYCL_F16=ON cmake --build build --config Release -j $(nproc) -# Disabled for now due to sporadic issue syncing. -# build-linux-cross: -# uses: ./.github/workflows/build-linux-cross.yml - + build-linux-cross: + uses: ./.github/workflows/build-linux-cross.yml macOS-latest-cmake-ios: runs-on: macos-latest From 945f5de2850d337afc86cc347ece373edc25583f Mon Sep 17 00:00:00 2001 From: Mason M Date: Wed, 30 Apr 2025 13:10:57 -0300 Subject: [PATCH 14/17] Remove erroneous fi --- .github/workflows/build-linux-cross.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-linux-cross.yml b/.github/workflows/build-linux-cross.yml index db3b74bb545b1..93c8bfe52745a 100644 --- a/.github/workflows/build-linux-cross.yml +++ b/.github/workflows/build-linux-cross.yml @@ -29,7 +29,6 @@ jobs: deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ noble-security main restricted universe multiverse deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ noble-backports main restricted universe multiverse EOF - fi sudo apt-get update sudo apt-get install -y --no-install-recommends \ From 08de158e08ee84e2bb45ed88a2be5376337c4a69 Mon Sep 17 00:00:00 2001 From: Mason M Date: Wed, 30 Apr 2025 13:26:54 -0300 Subject: [PATCH 15/17] Fully clean apt sources/cache --- .github/workflows/build-linux-cross.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/build-linux-cross.yml b/.github/workflows/build-linux-cross.yml index 93c8bfe52745a..ce4dd66ff25a9 100644 --- a/.github/workflows/build-linux-cross.yml +++ b/.github/workflows/build-linux-cross.yml @@ -13,6 +13,12 @@ jobs: run: | sudo dpkg --add-architecture riscv64 + # Backup original sources + sudo cp /etc/apt/sources.list /etc/apt/sources.list.backup + + # Completely replace the sources configuration to handle all architectures properly + sudo rm -f /etc/apt/sources.list.d/*.list + # Create a new sources.list with explicit architecture handling cat << EOF | sudo tee /etc/apt/sources.list # Standard repositories for amd64 only @@ -30,7 +36,11 @@ jobs: deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ noble-backports main restricted universe multiverse EOF + # Clean and update the apt cache + sudo apt-get clean + sudo rm -rf /var/lib/apt/lists/* sudo apt-get update + sudo apt-get install -y --no-install-recommends \ build-essential \ gcc-14-riscv64-linux-gnu \ From bca884556a5b2c77830de9753b6c57bbeafaf952 Mon Sep 17 00:00:00 2001 From: Mason M Date: Thu, 1 May 2025 11:22:26 -0300 Subject: [PATCH 16/17] Suppress failure with bad apt-get URLs --- .github/workflows/build-linux-cross.yml | 68 ++++++++++++------------- 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/.github/workflows/build-linux-cross.yml b/.github/workflows/build-linux-cross.yml index ce4dd66ff25a9..c58d3930d659d 100644 --- a/.github/workflows/build-linux-cross.yml +++ b/.github/workflows/build-linux-cross.yml @@ -4,7 +4,7 @@ on: workflow_call: jobs: - ubuntu-latest-riscv64-cpu-cross: + ubuntu-24-riscv64-cpu-cross: runs-on: ubuntu-24.04 steps: @@ -13,33 +13,15 @@ jobs: run: | sudo dpkg --add-architecture riscv64 - # Backup original sources - sudo cp /etc/apt/sources.list /etc/apt/sources.list.backup - - # Completely replace the sources configuration to handle all architectures properly - sudo rm -f /etc/apt/sources.list.d/*.list - - # Create a new sources.list with explicit architecture handling - cat << EOF | sudo tee /etc/apt/sources.list - # Standard repositories for amd64 only - deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble main restricted universe multiverse - deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble-updates main restricted universe multiverse - deb [arch=amd64] http://security.ubuntu.com/ubuntu/ noble-security main restricted universe multiverse - deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble-backports main restricted universe multiverse - EOF - # Add arch-specific repositories for non-amd64 architectures cat << EOF | sudo tee /etc/apt/sources.list.d/riscv64-ports.list - deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ noble main restricted universe multiverse - deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ noble-updates main restricted universe multiverse - deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ noble-security main restricted universe multiverse - deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ noble-backports main restricted universe multiverse + deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ noble main universe + deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ noble-updates main universe + deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ noble-security main universe + deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ noble-backports main universe EOF - # Clean and update the apt cache - sudo apt-get clean - sudo rm -rf /var/lib/apt/lists/* - sudo apt-get update + sudo apt-get update || true ;# Prevent failure due to missing URLs. sudo apt-get install -y --no-install-recommends \ build-essential \ @@ -65,8 +47,8 @@ jobs: cmake --build build --config Release -j $(nproc) - ubuntu-latest-riscv64-vulkan-cross: - runs-on: ubuntu-latest + ubuntu-24-riscv64-vulkan-cross: + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 @@ -76,10 +58,17 @@ jobs: - name: Setup Riscv run: | sudo dpkg --add-architecture riscv64 - sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \ - /etc/apt/sources.list /etc/apt/apt-mirrors.txt - sudo apt-get clean - sudo apt-get update + + # Add arch-specific repositories for non-amd64 architectures + cat << EOF | sudo tee /etc/apt/sources.list.d/riscv64-ports.list + deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ noble main universe + deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ noble-updates main universe + deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ noble-security main universe + deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ noble-backports main universe + EOF + + sudo apt-get update || true ;# Prevent failure due to missing URLs. + sudo apt-get install -y --no-install-recommends \ build-essential \ glslc \ @@ -107,8 +96,8 @@ jobs: cmake --build build --config Release -j $(nproc) - ubuntu-latest-arm64-vulkan-cross: - runs-on: ubuntu-latest + ubuntu-24-arm64-vulkan-cross: + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 @@ -118,10 +107,17 @@ jobs: - name: Setup Arm64 run: | sudo dpkg --add-architecture arm64 - sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \ - /etc/apt/sources.list /etc/apt/apt-mirrors.txt - sudo apt-get clean - sudo apt-get update + + # Add arch-specific repositories for non-amd64 architectures + cat << EOF | sudo tee /etc/apt/sources.list.d/arm64-ports.list + deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ noble main universe + deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ noble-updates main universe + deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ noble-security main universe + deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ noble-backports main universe + EOF + + sudo apt-get update || true ;# Prevent failure due to missing URLs. + sudo apt-get install -y --no-install-recommends \ build-essential \ glslc \ From b54bb2b8d795dce2d00b4ead3b03f6db743f0b3e Mon Sep 17 00:00:00 2001 From: Mason M Date: Thu, 1 May 2025 17:52:00 -0300 Subject: [PATCH 17/17] Remove fetch-depth --- .github/workflows/build-linux-cross.yml | 6 ------ examples/main/main.cpp | 1 - 2 files changed, 7 deletions(-) diff --git a/.github/workflows/build-linux-cross.yml b/.github/workflows/build-linux-cross.yml index c58d3930d659d..d104b8b12432e 100644 --- a/.github/workflows/build-linux-cross.yml +++ b/.github/workflows/build-linux-cross.yml @@ -52,9 +52,6 @@ jobs: steps: - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Setup Riscv run: | sudo dpkg --add-architecture riscv64 @@ -101,9 +98,6 @@ jobs: steps: - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Setup Arm64 run: | sudo dpkg --add-architecture arm64 diff --git a/examples/main/main.cpp b/examples/main/main.cpp index fd7b335c4dae9..c59b941bf5e47 100644 --- a/examples/main/main.cpp +++ b/examples/main/main.cpp @@ -15,7 +15,6 @@ #include #include - #if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__)) #include #include