From 68c5fa0e96b2e4477421b9a32e8d8e5a3399c538 Mon Sep 17 00:00:00 2001
From: Gregor Jasny <gjasny@googlemail.com>
Date: Tue, 29 Mar 2022 18:23:36 +0200
Subject: [PATCH 1/2] ci: use clang-format-12

---
 .github/workflows/linting.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index 99d82503..02e86204 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -45,14 +45,16 @@ jobs:
       - name: Checkout source
         uses: actions/checkout@v2
 
-      - name: Install dependencies
-        run: |
-          sudo apt-get remove -y --purge man-db # avoid time-consuming trigger
-          sudo apt-get update
-          sudo apt-get install -y clang-format-11
+      # clang-format comes pre-installed
+      # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md
+      #- name: Install dependencies
+      #  run: |
+      #    sudo apt-get remove -y --purge man-db # avoid time-consuming trigger
+      #    sudo apt-get update
+      #    sudo apt-get install -y clang-format-12
 
       - name: Run clang-format
-        run: find . -type f \( -name '*.c' -o -name '*.cc' -o -name '*.cpp' -o -name '*.cxx' -o -name '*.o' -o -name '*.h' -o -name '*.hpp' -o -name '*.hxx' \) -exec clang-format-11 -style=file -i {} \;
+        run: find . -type f \( -name '*.c' -o -name '*.cc' -o -name '*.cpp' -o -name '*.cxx' -o -name '*.o' -o -name '*.h' -o -name '*.hpp' -o -name '*.hxx' \) -exec clang-format-12 -style=file -i {} \;
 
       - name: Check for changes
         run: git diff --exit-code

From 864fac499639451e55d6e595b8db20dfcda1e999 Mon Sep 17 00:00:00 2001
From: Gregor Jasny <gjasny@googlemail.com>
Date: Tue, 29 Mar 2022 19:44:14 +0200
Subject: [PATCH 2/2] ci: replace windows-2016 agent

---
 .github/workflows/bazel-ci.yml | 2 +-
 .github/workflows/cmake-ci.yml | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/bazel-ci.yml b/.github/workflows/bazel-ci.yml
index 841d9b3a..e3007a2a 100644
--- a/.github/workflows/bazel-ci.yml
+++ b/.github/workflows/bazel-ci.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-20.04, windows-2019]
+        os: [macos-latest, ubuntu-latest, windows-latest]
     steps:
       - name: Checkout source
         uses: actions/checkout@v2
diff --git a/.github/workflows/cmake-ci.yml b/.github/workflows/cmake-ci.yml
index 562fae52..bfc0e8bb 100644
--- a/.github/workflows/cmake-ci.yml
+++ b/.github/workflows/cmake-ci.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macOS-latest, ubuntu-18.04, windows-2016]
+        os: [macOS-latest, ubuntu-18.04, windows-2019]
         dependencies: [submodule, vcpkg]
     steps:
       - name: Checkout source
@@ -29,6 +29,10 @@ jobs:
           path: "~/.cache/vcpkg/archives"
           key: vcpkg-${{ matrix.os }}
 
+      - name: Default to x64-windows vcpkg triplet
+        if: matrix.dependencies == 'vcpkg' && runner.os == 'Windows'
+        run: echo "VCPKG_DEFAULT_TRIPLET=x64-windows" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+
       - name: Install vcpkg dependencies
         if: matrix.dependencies == 'vcpkg'
         run: vcpkg install benchmark civetweb curl[core] gtest zlib