Temporary ci.yml test update

cul · Dec 23, 2024 · 30a068f · 30a068f
1 parent f5fbb44
commit 30a068f
Showing 1 changed file with 6 additions and 42 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   ci:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04 # Ubuntu 24 has vips 8.15, but Ubuntu 22 only has vips 8.12
     strategy:
       matrix:
         ruby-version: ['3.2.2']
@@ -32,48 +32,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+      - name: Install vips
+        run: sudo apt install -y libvips-tools
+      - name: Check vips version
+        run: vips --version
       - name: Install libxslt for nokogiri gem (required for version < 1.11)
         run: sudo apt-get install -y libxml2-dev libxslt-dev
-      - name: Build libvips (so we can use version ${{ matrix.vips-version }}, since only 8.12 is available on Ubuntu 22)
-        if: matrix.vips-version != 'apt-default-vips'
-        run: |
-          # Instructions below are based on:
-          # https://www.libvips.org/install.html
-          # and
-          # https://github.com/libvips/libvips/wiki/Build-for-Ubuntu
-          #
-          # Unstall any already-installed version of vips
-          sudo apt-get remove libvips42
-
-          # Install meson build system
-          sudo apt-get install -y meson
-
-          # Download build dependencies
-          sudo apt-get install -y build-essential pkg-config libglib2.0-dev libexpat1-dev
-
-          # Download various libraries that we want for vips features
-          sudo apt-get install -y \
-          libfftw3-dev libexif-dev libjpeg-turbo8-dev \
-          libpng-dev libwebp-dev libtiff5-dev \
-          libheif-dev libexpat1-dev libcfitsio-dev \
-          libmatio-dev libnifti-dev libhwy-dev \
-          liblcms2-dev libpoppler-glib-dev librsvg2-dev \
-          libopenexr-dev libpango1.0-dev libarchive-dev \
-          libopenslide-dev libffi-dev libopenjp2-7-dev \
-          libimagequant-dev libcgif-dev \
-          liborc-0.4-dev # FIXME: Remove once libhwy 1.0.5 is available.
-
-          # Download and compile selected version of vips
-          cd /tmp
-          wget https://github.com/libvips/libvips/releases/download/v${{ matrix.vips-version }}/vips-${{ matrix.vips-version }}.tar.xz
-          tar xf vips-${{ matrix.vips-version }}.tar.xz
-          cd vips-${{ matrix.vips-version }}
-          meson build --libdir=lib --buildtype=release -Dintrospection=disabled
-          cd build
-          ninja
-          ninja test
-          sudo ninja install
-          vips --version
       - name: Add --no-document option to .gemrc file to speed up bundle install
         run: "echo 'gem: --no-document' > ~/.gemrc"
       - name: Set up Ruby
@@ -86,6 +50,6 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
       - run: npm install -g yarn
-      - run: yarn install
+      - run: yarn install --frozen-lockfile
       - name: Run CI task
         run: bundle exec rake triclops:ci