Enable new engine build CI on pushes and PRs

beyond-all-reason · Oct 20, 2024 · e69f380 · e69f380
1 parent 19b0efc
commit e69f380
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/engine-build.yml b/.github/workflows/engine-build.yml
@@ -23,16 +23,15 @@ on:
         description: "Recache ccache build objects"
         type: boolean
         default: false
-  # TODO: Uncomment after it's merged and docker images are availabe
-  # pull_request:
-  #   paths-ignore:
-  #     - 'doc/**'
-  # push:
-  #   branches:
-  #     - master
-  #     # TODO: add release branches once their naming is finalized
-  #   paths-ignore:
-  #     - 'doc/**'
+  pull_request:
+    paths-ignore:
+      - 'doc/**'
+  push:
+    branches:
+      - master
+      # TODO: add release branches once their naming is finalized
+    paths-ignore:
+      - 'doc/**'
 jobs:
   build-engine:
     if: github.repository == 'beyond-all-reason/spring' || github.event_name == 'workflow_dispatch'

diff --git a/docker-build-v2/build.sh b/docker-build-v2/build.sh
@@ -46,7 +46,7 @@ mkdir -p build-$OS .cache/ccache-$OS
 image=recoil-build-amd64-$OS:latest
 if [[ -z "$(docker images -q $image 2> /dev/null)" ]]; then
   image=ghcr.io/beyond-all-reason/recoil-build-amd64-$OS:latest
-  docker pull $image > /dev/null
+  docker pull $image
 fi
 
 docker run -it --rm \