From 90a7fe3bdaa1824c168addf74f4ef7bba621eac4 Mon Sep 17 00:00:00 2001
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
Date: Fri, 2 Aug 2024 16:48:36 +0200
Subject: [PATCH 1/4] CI: remove `pull_request_target` event

---
 .github/workflows/test.yml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ed7f306..617e861 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,13 +1,6 @@
 name: Test
 
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-  pull_request_target:
-    branches:
-      - master
+on: [push, pull_request]
 
 env:
   NOKOGIRI_USE_SYSTEM_LIBRARIES: true

From 8d87f5c77f7a98cb193376ea58652a1201755500 Mon Sep 17 00:00:00 2001
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
Date: Fri, 2 Aug 2024 16:49:05 +0200
Subject: [PATCH 2/4] CI: upgrade runner to Ubuntu 24.04

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 617e861..51c7958 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -29,7 +29,7 @@ jobs:
 
     strategy:
       matrix:
-        os-version: [ 'ubuntu-20.04' ]
+        os-version: [ 'ubuntu-24.04' ]
         ruby-version:
           - '2.3'
           - '2.4'

From 5c01af149645977704fdb2a9e8f7e950102f92bc Mon Sep 17 00:00:00 2001
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
Date: Fri, 2 Aug 2024 16:50:17 +0200
Subject: [PATCH 3/4] CI: consolidate and simplify APT steps

---
 .github/workflows/test.yml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 51c7958..a40b6fa 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -55,19 +55,13 @@ jobs:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
 
-      - name: Update apt
-        env:
-          DEBIAN_FRONTEND: noninteractive
-        run: 
-          sudo apt-get update -qq -o Acquire::Retries=3
-
       - name: Install libvips
         env:
           DEBIAN_FRONTEND: noninteractive
-        run:
+        run: |
+          sudo apt-get update
           # we only need the library
-          sudo apt-get install --no-install-recommends --fix-missing -qq -o Acquire::Retries=3
-            libvips 
+          sudo apt-get install --no-install-recommends libvips
 
       - name: Run Tests
         run: bundle exec rake spec

From 41f6e45c11ce37010a25255f4bb8d66e0c7de7aa Mon Sep 17 00:00:00 2001
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
Date: Fri, 2 Aug 2024 16:53:24 +0200
Subject: [PATCH 4/4] CI: remove redundant `DEBIAN_FRONTEND=noninteractive` env

The Linux runners on GitHub Actions already sets this env variable,
see:
https://github.com/actions/runner-images/blob/2a4bc14da46f1f8e358aa902a69edb9bef135472/images/ubuntu/scripts/build/configure-dpkg.sh#L17
---
 .github/workflows/test.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a40b6fa..a7216f4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -56,8 +56,6 @@ jobs:
           bundler-cache: true
 
       - name: Install libvips
-        env:
-          DEBIAN_FRONTEND: noninteractive
         run: |
           sudo apt-get update
           # we only need the library