From 4c73a3de592721c14a3b6a6b23e1936d8da81318 Mon Sep 17 00:00:00 2001
From: Yinan Zhou <yinan.a.zhou@gmail.com>
Date: Thu, 14 Mar 2024 17:28:24 -0400
Subject: [PATCH] Merge upstream changes

---
 .github/workflows/ci_build.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml
index 08437b037dc..f6bbe77946c 100644
--- a/.github/workflows/ci_build.yml
+++ b/.github/workflows/ci_build.yml
@@ -6,7 +6,7 @@ on:
     # but only for the branches specified
     branches:
       # Push events on develop branch
-      - develop
+      - 'develop'
       # Push events on ci-test branch (uncomment if needed for testing purposes)
       # - ci-test
     paths-ignore:
@@ -44,7 +44,7 @@ env:
   # emscripten
   EM_VERSION: latest
   EM_CACHE_FOLDER: "emsdk-cache"
-  EM_CACHE_ID: 2
+  EM_CACHE_ID: 3
 
   # gh-pages
   GH_PAGES_REPO: ${{ github.repository_owner }}/verovio.org # works from rism-digital and from forks
@@ -74,10 +74,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-20.04
-            compiler: g++
-            version: "9"
-
           - os: ubuntu-20.04
             compiler: g++
             version: "10"
@@ -86,13 +82,17 @@ jobs:
             compiler: g++
             version: "11"
 
+          - os: ubuntu-22.04
+            compiler: g++
+            version: "12"
+
           - os: ubuntu-20.04
             compiler: clang
-            version: "6.0"
+            version: "10"
 
           - os: ubuntu-20.04
             compiler: clang
-            version: "9"
+            version: "11"
 
           - os: ubuntu-20.04
             compiler: clang