Refresh the build on Ubuntu 18.04 and just Windows 2019.

mosra · Apr 20, 2023 · 3fe864b · 3fe864b
1 parent 0bb8687
commit 3fe864b
Showing 1 changed file with 19 additions and 11 deletions.
diff --git a/.github/workflows/assimp.yml b/.github/workflows/assimp.yml
@@ -11,14 +11,14 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-2019, windows-2016]
+        os: [windows-2019]
     steps:
     - name: Install Ninja
       uses: seanmiddleditch/gha-setup-ninja@v3
     - name: Set up Visual Studio environment
       uses: seanmiddleditch/gha-setup-vsdevenv@v3
     - name: Clone Assimp
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         repository: assimp/assimp
         ref: v${{ env.ASSIMP_VERSION }}
@@ -108,31 +108,39 @@ jobs:
 
   ubuntu:
     name: ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.runs-on }}
+    container: ${{ matrix.container }}
     strategy:
       matrix:
-        os: [ubuntu-18.04]
+        include:
+        - os: ubuntu-18.04
+          runs-on: ubuntu-latest
+          container: ubuntu:bionic-20220427
     steps:
-    - name: Install Ninja
-      uses: seanmiddleditch/gha-setup-ninja@v3
+    - name: Install base build tools
+      run: |
+        apt update
+        apt install -y ninja-build cmake g++
+        mkdir -p deps
     - name: Clone Assimp
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         repository: assimp/assimp
         ref: v${{ env.ASSIMP_VERSION }}
         path: assimp
     - name: Build & install
       run: |
-        cmake \
+        mkdir assimp-build && assimp-build
+        cmake ../assimp \
           -DCMAKE_BUILD_TYPE=Release \
           -DASSIMP_BUILD_ASSIMP_TOOLS=OFF \
           -DASSIMP_BUILD_TESTS=OFF \
           -DASSIMP_BUILD_ZLIB=ON \
           -DASSIMP_NO_EXPORT=ON \
           -DBUILD_SHARED_LIBS=OFF \
-          -DCMAKE_INSTALL_PREFIX=$(pwd)/install \
-          -G Ninja -S assimp -B assimp-build
-        ninja -C assimp-build install/strip
+          -DCMAKE_INSTALL_PREFIX=$(pwd)/../install \
+          -G Ninja
+        ninja install/strip
     - name: Upload artifacts
       uses: actions/upload-artifact@v1
       with: