internal: check Linux build on commonly used distros

skyrim-multiplayer · Dec 22, 2024 · c3b319b · c3b319b
1 parent e75cfd1
commit c3b319b
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 5 deletions.
diff --git a/.github/workflows/pr-ubuntu-docker.yml b/.github/workflows/pr-ubuntu-docker.yml
@@ -11,6 +11,18 @@ env:
 
 jobs:
     pr-ubuntu-docker:
+        strategy:
+          matrix:
+            base_system:
+            # The usual container used for all builds within the CI and the one
+            # we use as the base for server builds with preinstalled/cached deps
+            - vcpkg-deps
+
+            # Distros that our contributors are likely to run
+            # - ubuntu-2204
+            # - ubuntu-2404
+            # - debian
+            # - archlinux
         runs-on: ubuntu-latest
         steps:
           - name: Checkout
@@ -20,7 +32,17 @@ jobs:
 
           - name: Get image to build upon
             run: |
+                set -x  # print executed commands
                 cat ${{github.workspace}}/misc/github_env_linux >> "$GITHUB_ENV"
+                # get latest image
+                base_image="`misc/deps_linux/${{ matrix.base_system }}.sh --get-image-uri`"
+                docker run -it \
+                  --name prepare_deps_container \
+                  -v "${{github.workspace}}:/src" \
+                  "$base_image" \
+                  bash -c bash \
+                  'misc/deps_linux/${{ matrix.base_system }}.sh --ensure-deps-noninteractive'
+                docker commit prepare_deps_container localhost/buildimage
 
           - name: Store SP types from commit
             run: |
@@ -58,7 +80,7 @@ jobs:
           - name: Prepare
             uses: addnab/docker-run-action@v3
             with:
-                image: ${{ env.SKYMP_VCPKG_DEPS_IMAGE }}
+                image: localhost/buildimage
                 options: |
                     -v ${{github.workspace}}:/src
                 run: |
@@ -68,7 +90,7 @@ jobs:
             id: cmake_configure
             uses: addnab/docker-run-action@v3
             with:
-                image: ${{ env.SKYMP_VCPKG_DEPS_IMAGE }}
+                image: localhost/buildimage
                 options: |
                     -v ${{github.workspace}}:/src
                     -u skymp
@@ -94,7 +116,7 @@ jobs:
           - name: Build
             uses: addnab/docker-run-action@v3
             with:
-                image: ${{ env.SKYMP_VCPKG_DEPS_IMAGE }}
+                image: localhost/buildimage
                 options: |
                     -v ${{github.workspace}}:/src
                     -u skymp
@@ -105,7 +127,7 @@ jobs:
           - name: Prepare dist.tar.gz
             uses: addnab/docker-run-action@v3
             with:
-                image: ${{ env.SKYMP_VCPKG_DEPS_IMAGE }}
+                image: localhost/buildimage
                 options: |
                     -v ${{github.workspace}}:/src
                     -u skymp
@@ -164,7 +186,7 @@ jobs:
           - name: Test
             uses: addnab/docker-run-action@v3
             with:
-                image: ${{ env.SKYMP_VCPKG_DEPS_IMAGE }}
+                image: localhost/buildimage
                 options: |
                     -v ${{github.workspace}}:/src
                     -u skymp

diff --git a/misc/deps_linux/ubuntu-2204.json b/misc/deps_linux/ubuntu-2204.json
@@ -0,0 +1,3 @@
+{
+  "image": "ubuntu:22.04"
+}
diff --git a/misc/deps_linux/ubuntu-2404.json b/misc/deps_linux/ubuntu-2404.json
@@ -0,0 +1,3 @@
+{
+  "image": "ubuntu:24.04"
+}
diff --git a/misc/deps_linux/vcpkg-deps.sh b/misc/deps_linux/vcpkg-deps.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+if [[ "$1" == "--get-image-uri" ]]; then
+  . misc/github_env_linux && echo "$SKYMP_VCPKG_DEPS_IMAGE"
+  exit
+elif [[ "$1" == "--ensure-deps-noninteractive" ]]; then
+  # Nothing to prepare, vcpkg-deps image already contains all we need
+fi