From 61498b4ffbb783dedb62ae83f12d74e2eef6908f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole-Andr=C3=A9=20Rodlie?= <ole.andre.rodlie@gmail.com>
Date: Sun, 25 Aug 2024 18:06:38 +0200
Subject: [PATCH] More CI

---
 .github/workflows/linux.yml        | 1 -
 .github/workflows/ubuntu.yml       | 4 ++--
 src/scripts/build.sh               | 2 +-
 src/scripts/{build_ci.sh => ci.sh} | 0
 4 files changed, 3 insertions(+), 4 deletions(-)
 rename src/scripts/{build_ci.sh => ci.sh} (100%)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 033cee83e..295e9ae1c 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -16,6 +16,5 @@ jobs:
       with:
         name: friction-ci-linux-x86_64
         path: |
-          distfiles/builds/*/*.rpm
           distfiles/builds/*/*.xz
           distfiles/builds/*/*.AppImage
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index fec8a07a4..43453faec 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -1,4 +1,4 @@
-name: Ubuntu
+name: CI
 
 on: [push, pull_request]
 
@@ -10,4 +10,4 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Build
-      run: APT=1 CI=1 MKJOBS=2 ./src/scripts/build_ci.sh
+      run: APT=1 CI=1 MKJOBS=2 ./src/scripts/ci.sh
diff --git a/src/scripts/build.sh b/src/scripts/build.sh
index 08a8d205d..c9bf15151 100755
--- a/src/scripts/build.sh
+++ b/src/scripts/build.sh
@@ -59,4 +59,4 @@ fi
 
 cd ${CWD}
 
-BUILD_ENGINE=${BUILD_ENGINE} LOCAL_BUILD=0 MKJOBS=${MKJOBS} REL=${REL} BRANCH=${BRANCH} COMMIT=${COMMIT} ./src/scripts/run_vfxplatform.sh
+BUILD_ENGINE=${BUILD_ENGINE} LOCAL_BUILD=0 MKJOBS=${MKJOBS} REL=${REL} BRANCH=${BRANCH} COMMIT=${COMMIT} ./src/scripts/run_docker.sh
diff --git a/src/scripts/build_ci.sh b/src/scripts/ci.sh
similarity index 100%
rename from src/scripts/build_ci.sh
rename to src/scripts/ci.sh