work on ci scripts

gulrak · Apr 27, 2024 · 56776c9 · 56776c9
1 parent 42ea4fc
commit 56776c9
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 68 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -1,6 +1,6 @@
 freebsd_task:
   freebsd_instance:
-    image_family: freebsd-12-1
+    image_family: freebsd-14-0
   install_script: |
     pkg install -y cmake
     pw groupadd testgrp

diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
@@ -10,104 +10,77 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - name: "Ubuntu 20.04 GCC 9.3"
-            os: ubuntu-20.04
+          - name: "Ubuntu 22.04 GCC 11"
+            os: ubuntu-22.04
             build_type: Release
             packages: ninja-build
             generator: Ninja
             compatibility: "cxx_std_11;cxx_std_17;cxx_std_20"
             cc: gcc
             cxx: g++
 
-          - name: "Ubuntu 20.04 Clang 10.0"
-            os: ubuntu-20.04
+          - name: "Ubuntu 22.04 Clang 13.0"
+            os: ubuntu-22.04
             build_type: Release
             packages: ninja-build
             generator: Ninja
             compatibility: "cxx_std_11;cxx_std_17;cxx_std_20"
-            cc: clang-10
-            cxx: clang++-10
+            cc: clang-13
+            cxx: clang++-13
 
-          - name: "Ubuntu 20.04 Clang 11.0"
-            os: ubuntu-20.04
+          - name: "Ubuntu 20.04 Clang 15.0"
+            os: ubuntu-22.04
             build_type: Release
-            packages: ninja-build clang-11 libc++-11-dev libc++abi-11-dev
+            packages: ninja-build
             generator: Ninja
             compatibility: "cxx_std_11;cxx_std_17;cxx_std_20"
-            cc: clang-11
-            cxx: clang++-11
+            cc: clang-15
+            cxx: clang++-15
 
-          - name: "Ubuntu 20.04 GCC 9.3 coverage"
-            os: ubuntu-20.04
+          - name: "Ubuntu 22.04 GCC 11 coverage"
+            os: ubuntu-22.04
             build_type: Debug
             packages: ninja-build lcov
             generator: Ninja
             compatibility: "cxx_std_11;cxx_std_17;cxx_std_20"
             cc: gcc
             cxx: g++
 
-          - name: "Ubuntu 18.04 GCC 8.4"
-            os: ubuntu-18.04
-            build_type: Release
-            packages: ninja-build gcc-8 g++-8
-            generator: Ninja
-            compatibility: "cxx_std_11;cxx_std_17"
-            cc: gcc-8
-            cxx: g++-8
-
-          - name: "Ubuntu 18.04 GCC 7.5"
-            os: ubuntu-18.04
+          - name: "Ubuntu 20.04 GCC 9.3"
+            os: ubuntu-20.04
             build_type: Release
             packages: ninja-build
             generator: Ninja
-            compatibility: "cxx_std_11;cxx_std_17"
-            cc: gcc-7
-            cxx: g++-7
-
-          - name: "Ubuntu 18.04 GCC 6.5"
-            os: ubuntu-18.04
-            build_type: Release
-            packages: ninja-build gcc-6 g++-6
-            generator: Ninja
-            compatibility: "cxx_std_11;cxx_std_17"
-            cc: gcc-6
-            cxx: g++-6
-
-          - name: "Ubuntu 18.04 GCC 5.5"
-            os: ubuntu-18.04
-            build_type: Release
-            packages: ninja-build gcc-5 g++-5
-            generator: Ninja
-            compatibility: "cxx_std_11;cxx_std_17"
-            cc: gcc-5
-            cxx: g++-5
+            compatibility: "cxx_std_11;cxx_std_17;cxx_std_20"
+            cc: gcc
+            cxx: g++
 
-          - name: "Ubuntu 18.04 Clang 9.0"
-            os: ubuntu-18.04
+          - name: "Ubuntu 20.04 Clang 10.0"
+            os: ubuntu-20.04
             build_type: Release
-            packages: ninja-build libc++-9-dev libc++abi-9-dev
+            packages: ninja-build
             generator: Ninja
             compatibility: "cxx_std_11;cxx_std_17;cxx_std_20"
-            cc: clang
-            cxx: clang++
+            cc: clang-10
+            cxx: clang++-10
 
-          - name: "Ubuntu 18.04 Clang 6.0"
-            os: ubuntu-18.04
+          - name: "Ubuntu 20.04 Clang 11.0"
+            os: ubuntu-20.04
             build_type: Release
-            packages: ninja-build clang-6.0
+            packages: ninja-build clang-11 libc++-11-dev libc++abi-11-dev
             generator: Ninja
-            compatibility: "cxx_std_11;cxx_std_17"
-            cc: clang-6.0
-            cxx: clang++-6.0
+            compatibility: "cxx_std_11;cxx_std_17;cxx_std_20"
+            cc: clang-11
+            cxx: clang++-11
 
-          - name: "Ubuntu 18.04 Clang 5.0"
-            os: ubuntu-18.04
-            build_type: Release
-            packages: ninja-build clang-5.0
+          - name: "Ubuntu 20.04 GCC 9.3 coverage"
+            os: ubuntu-20.04
+            build_type: Debug
+            packages: ninja-build lcov
             generator: Ninja
-            compatibility: "cxx_std_11;cxx_std_17"
-            cc: clang-5.0
-            cxx: clang++-5.0
+            compatibility: "cxx_std_11;cxx_std_17;cxx_std_20"
+            cc: gcc
+            cxx: g++
 
           - name: "Windows MSVC 2019"
             os: windows-2019
@@ -118,16 +91,25 @@ jobs:
             cc: cl
             cxx: cl
 
-          - name: "macOS 10.15 AppleClang"
-            os: macos-10.15
+          - name: "macOS 13 AppleClang"
+            os: macos-13
+            build_type: Release
+            packages: ninja
+            generator: Ninja
+            compatibility: "cxx_std_11;cxx_std_17;cxx_std_20"
+            cc: clang
+            cxx: clang++
+
+          - name: "macOS 12 AppleClang"
+            os: macos-12
             build_type: Release
             packages: ninja
             generator: Ninja
             compatibility: "cxx_std_11;cxx_std_17"
             cc: clang
             cxx: clang++
 
-          - name: "macOS 11.6 AppleClang"
+          - name: "macOS 11 AppleClang"
             os: macos-11
             build_type: Release
             packages: ninja

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.7.2)
 project(
    ghcfilesystem,
-   VERSION 1.5.14
+   VERSION 1.5.15
 )
 
 if (POLICY CMP0077)