More CI

friction2d · Aug 25, 2024 · 61498b4 · 61498b4
1 parent 9ff217b
commit 61498b4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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 → src/scripts/ci.sh b/src/scripts/build_ci.sh → src/scripts/ci.sh