From f1f15b72878d33923f3744fbf530f5729ae5e8cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
Date: Thu, 14 Jul 2022 09:10:08 +0200
Subject: Update used OSes for GitHub Actions

* Switch off failing Windows tests
* MacOS 10.15 is going away:
  https://github.blog/changelog/2022-07-20-github-actions-the-macos-10-15-actions-runner-image-is-being-deprecated-and-will-be-removed-by-8-30-22/
---
 .github/workflows/macos.yml            |  4 ++-
 .github/workflows/ubuntu.yml           |  3 +-
 .github/workflows/windows.yml          | 64 ---------------------------------
 .github/workflows/windows.yml.NOACTIVE | 65 ++++++++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+), 66 deletions(-)
 delete mode 100644 .github/workflows/windows.yml
 create mode 100644 .github/workflows/windows.yml.NOACTIVE

(limited to '.github')

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 173a520..ae6be3a 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -7,7 +7,8 @@ jobs:
     strategy:
       matrix:
         os:
-          - macos-10.15
+          - macos-12
+          - macos-11 # latest
         config:
           - ""
           - --disable-curses
@@ -25,6 +26,7 @@ jobs:
     - name: Dependency Homebrew
       run: |
         brew install \
+          coreutils \
           libtermkey \
           lua \
           luarocks \
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index d2750a9..2c779c5 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -7,7 +7,8 @@ jobs:
     strategy:
       matrix:
         os:
-          - ubuntu-16.04
+          - ubuntu-22.04 # should be latest, documentation is outdated
+          - ubuntu-20.04 # latest
           - ubuntu-18.04
         config:
           - ""
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
deleted file mode 100644
index c09c69d..0000000
--- a/.github/workflows/windows.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-name: Windows
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        os:
-          - windows-2019
-        config:
-          - ""
-          - --disable-lua
-          - --disable-help
-    runs-on: ${{ matrix.os }}
-    env:
-      CFLAGS_EXTRA: --coverage
-    steps:
-
-    - name: Dependency
-      run: |
-        choco install --no-progress --yes --force --source=cygwin gcc-core,libtool,make,wget,pkg-config
-        choco install --no-progress --yes --force --source=cygwin lua,lua-devel,lua-lpeg,libncurses-devel
-
-    - name: Setup $PATH
-      shell: bash
-      run: echo 'C:\tools\cygwin\bin' >> $GITHUB_PATH
-
-    - name: Git configuration
-      run: |
-        git config --global core.autocrlf input
-        git config --global core.symlinks true
-
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Cygwin git configuration
-      shell: bash
-      run: mkdir $HOME && git config --global core.autocrlf input
-
-    - name: Libtermkey
-      shell: bash
-      run: make dependency/build/libtermkey-install
-
-    - name: Build
-      shell: bash
-      run: ./configure CFLAGS="-I$(pwd)/dependency/install/usr/include" LDFLAGS="-L$(pwd)/dependency/install/usr/lib" ${{ matrix.config }} && make
-
-    - name: Test
-      shell: bash
-      run: make test
-
-    - name: Upload Test Coverage
-      shell: bash
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-      run: |
-        curl -s https://codecov.io/bash > codecov
-        curl -s https://raw.githubusercontent.com/codecov/codecov-bash/master/SHA256SUM > codecov.sha256
-        if ! sha256sum -c --ignore-missing --status codecov.sha256 ; then
-          echo "Download checksum verification failed"
-          exit 1
-        fi
-        bash < codecov
diff --git a/.github/workflows/windows.yml.NOACTIVE b/.github/workflows/windows.yml.NOACTIVE
new file mode 100644
index 0000000..766a472
--- /dev/null
+++ b/.github/workflows/windows.yml.NOACTIVE
@@ -0,0 +1,65 @@
+name: Windows
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os:
+          - windows-2022 # latest
+          - windows-2019
+        config:
+          - ""
+          - --disable-lua
+          - --disable-help
+    runs-on: ${{ matrix.os }}
+    env:
+      CFLAGS_EXTRA: --coverage
+    steps:
+
+    - name: Dependency
+      run: |
+        choco install --no-progress --yes --force --source=cygwin gcc-core,libtool,make,wget,pkg-config
+        choco install --no-progress --yes --force --source=cygwin lua,lua-devel,lua-lpeg,libncurses-devel
+
+    - name: Setup $PATH
+      shell: bash
+      run: echo 'C:\tools\cygwin\bin' >> $GITHUB_PATH
+
+    - name: Git configuration
+      run: |
+        git config --global core.autocrlf input
+        git config --global core.symlinks true
+
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Cygwin git configuration
+      shell: bash
+      run: mkdir $HOME && git config --global core.autocrlf input
+
+    - name: Libtermkey
+      shell: bash
+      run: make dependency/build/libtermkey-install
+
+    - name: Build
+      shell: bash
+      run: ./configure CFLAGS="-I$(pwd)/dependency/install/usr/include" LDFLAGS="-L$(pwd)/dependency/install/usr/lib" ${{ matrix.config }} && make
+
+    - name: Test
+      shell: bash
+      run: make test
+
+    - name: Upload Test Coverage
+      shell: bash
+      env:
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      run: |
+        curl -s https://codecov.io/bash > codecov
+        curl -s https://raw.githubusercontent.com/codecov/codecov-bash/master/SHA256SUM > codecov.sha256
+        if ! sha256sum -c --ignore-missing --status codecov.sha256 ; then
+          echo "Download checksum verification failed"
+          exit 1
+        fi
+        bash < codecov
-- 
cgit v1.2.3