From 1664ac24cd776ad41de75603b1f74896812472ce Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Fri, 15 Dec 2023 02:05:42 -0500
Subject: [PATCH 1/2] ci: Remove Ubuntu 16

Runner is no longer supported.
Removed other commented out lines
---
 .github/workflows/build-and-test.yml | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 86975970a..a71b1e871 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -13,7 +13,6 @@ on:
 jobs:
 
   linux-and-mac:
-    # if: ${{ false }}
     runs-on: ${{ matrix.config.os }}
     name: ${{ matrix.config.os }} BUILD=${{ matrix.config.build }} CC=${{ matrix.config.cc }} CXX=${{ matrix.config.cxx }} AUTOTOOLS=${{ matrix.config.autotools }}
 
@@ -21,12 +20,6 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          #- {os: ubuntu-16.04, build: 'static', cc: 'gcc-4.4', cxx: 'g++-4.4', autotools: 'no', cppstd: 'gnu++0x'}
-          #- {os: ubuntu-16.04, build: 'static', cc: 'gcc-4.6', cxx: 'g++-4.6', autotools: 'no', cppstd: 'gnu++0x'}
-          - {os: ubuntu-16.04, build: 'static', cc: 'gcc-4.7', cxx: 'g++-4.7', autotools: 'no', cppstd: 'gnu++11'}
-          - {os: ubuntu-16.04, build: 'static', cc: 'gcc-4.8', cxx: 'g++-4.8', autotools: 'no', cppstd: 'c++11'}
-          - {os: ubuntu-16.04, build: 'static', cc: 'gcc-5', cxx: 'g++-5', autotools: 'no', cppstd: 'c++11'}
-          - {os: ubuntu-16.04, build: 'static', cc: 'gcc-6', cxx: 'g++-6', autotools: 'no', cppstd: 'c++11'}
           - {os: ubuntu-latest, build: 'static', cc: 'gcc-7', cxx: 'g++-7', autotools: 'no', cppstd: 'c++11'}
           - {os: ubuntu-latest, build: 'shared', cc: 'gcc', cxx: 'g++', autotools: 'yes', cppstd: 'c++11'}
           - {os: ubuntu-latest, build: 'static', cc: 'gcc', cxx: 'g++', autotools: 'yes', cppstd: 'c++11'}
@@ -51,16 +44,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      if: matrix.config.os == 'ubuntu-16.04'
-      with:
-        ruby-version: 2.6
-    - name: Install ruby hrx module
-      if: matrix.config.os == 'ubuntu-16.04'
-      run: sudo /opt/hostedtoolcache/Ruby/2.6.7/x64/bin/gem install hrx
-    - name: Install ruby minitest module
-      if: matrix.config.os == 'ubuntu-16.04'
-      run: sudo /opt/hostedtoolcache/Ruby/2.6.7/x64/bin/gem install minitest
     - name: Install automake if needed (MacOS)
       if: runner.os == 'macOS'
       run: brew install automake
@@ -212,7 +195,3 @@ jobs:
       run: make sassc BUILD=${{ matrix.config.build }}
     - name: Execute spec test runner
       run: ruby sass-spec/sass-spec.rb --probe-todo --impl libsass -c sassc/bin/sassc.exe -s sass-spec/spec
-
-
-#- name: Install LLVM and Clang
-#  uses: KyleMayes/install-llvm-action@v1.2.2

From de9b2aff9c3dd218c171f9d4077f7c511a413968 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Fri, 15 Dec 2023 02:12:33 -0500
Subject: [PATCH 2/2] ci: Remove setup for old GCC

Not longer used after Ubuntu 16 removed from matrix
---
 .github/workflows/build-and-test.yml | 43 ----------------------------
 1 file changed, 43 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index a71b1e871..7004cc475 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -53,49 +53,6 @@ jobs:
         sudo add-apt-repository ppa:ubuntu-toolchain-r/test
         sudo apt update
         sudo apt install g++-7 -y
-    - name: Install gcc 6 if needed
-      if: matrix.config.cc == 'gcc-6'
-      run: |
-        sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-        sudo apt update
-        sudo apt install g++-6 -y
-    - name: Install gcc 5 if needed
-      if: matrix.config.cc == 'gcc-5'
-      run: |
-        sudo add-apt-repository universe
-        sudo add-apt-repository multiverse
-        sudo apt update
-        sudo apt install g++-5 -y
-    - name: Install gcc 4.8 if needed
-      if: matrix.config.cc == 'gcc-4.8'
-      run: |
-        sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-        sudo apt update
-        sudo apt install g++-4.8 -y
-    - name: Install gcc 4.7 if needed
-      if: matrix.config.cc == 'gcc-4.7'
-      run: |
-        sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-        sudo apt update
-        sudo apt install g++-4.7 -y
-    - name: Install gcc 4.6 if needed
-      if: matrix.config.cc == 'gcc-4.6'
-      run: |
-        sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-        sudo apt update
-        sudo apt install g++-4.6 -y
-    - name: Install gcc 4.5 if needed
-      if: matrix.config.cc == 'gcc-4.5'
-      run: |
-        sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-        sudo apt update
-        sudo apt install g++-4.5 -y
-    - name: Install gcc 4.4 if needed
-      if: matrix.config.cc == 'gcc-4.4'
-      run: |
-        sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-        sudo apt update
-        sudo apt install g++-4.4 -y
     - name: ./script/ci-install-deps
       env:
         MAKE_OPTS: LIBSASS_CPPSTD=${{ matrix.config.cppstd }}