From 9cb1ede5cdf52232f36aac611328d71beb15083a Mon Sep 17 00:00:00 2001
From: Lakshya Kapoor <4314581+kapoorlakshya@users.noreply.github.com>
Date: Thu, 6 Jun 2024 06:11:03 +0000
Subject: [PATCH] Update actions yml

---
 .github/workflows/tests.yml | 54 +++++++++++++++----------------------
 1 file changed, 21 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c9aa500..9be87f5 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -3,19 +3,19 @@ name: Tests
 
 on: [push, pull_request]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   lint:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
-      - name: Cancel any previous run(s) on new commit push
-        uses: styfle/cancel-workflow-action@0.8.0
-        with:
-          access_token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.5
+          ruby-version: 3.3
           bundler-cache: true
       - name: Run rubocop
         run: bundle exec rake rubocop
@@ -24,17 +24,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: [2.7, jruby]
+        ruby-version: [2.7, 3.3, jruby]
     env:
       DISPLAY: ":0"
     steps:
-    - name: Cancel any previous run(s) on new commit push
-      uses: styfle/cancel-workflow-action@0.8.0
-      with:
-        access_token: ${{ secrets.GITHUB_TOKEN }}
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up ffmpeg
-      uses: FedericoCarboni/setup-ffmpeg@v1
+      uses: FedericoCarboni/setup-ffmpeg@v3
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
       id: setup-ffmpeg
@@ -43,24 +39,20 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
-    - name: Start xvfb
-      run: Xvfb -ac $DISPLAY -screen 0 1024x768x24 > /dev/null 2>&1 &
-    - name: Run tests
-      run: bundle exec rake spec
+    - name: Run headless test
+      uses: coactions/setup-xvfb@v1
+      with:
+        run: bundle exec rake spec
 
   test-windows:
     runs-on: windows-latest
     strategy:
       matrix:
-        ruby-version: [2.5, jruby]
+        ruby-version: [2.7, 3.3, jruby]
     steps:
-      - name: Cancel any previous run(s) on new commit push
-        uses: styfle/cancel-workflow-action@0.8.0
-        with:
-          access_token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up ffmpeg
-        uses: FedericoCarboni/setup-ffmpeg@v1
+        uses: FedericoCarboni/setup-ffmpeg@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
         id: setup-ffmpeg
@@ -73,18 +65,14 @@ jobs:
         run: bundle exec rake spec
 
   test-macos:
-    runs-on: macos-latest
+    runs-on: macos-13
     strategy:
       matrix:
-        ruby-version: [2.5, 2.7]
+        ruby-version: [2.7, 3.3]
     steps:
-      - name: Cancel any previous run(s) on new commit push
-        uses: styfle/cancel-workflow-action@0.8.0
-        with:
-          access_token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up ffmpeg
-        uses: FedericoCarboni/setup-ffmpeg@v1
+        uses: FedericoCarboni/setup-ffmpeg@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
         id: setup-ffmpeg