From b37f76760eda33594b4a6edce757a3707200091f Mon Sep 17 00:00:00 2001
From: levalup <likier@sina.cn>
Date: Mon, 1 Jul 2024 19:44:57 +0800
Subject: [PATCH] fix ci failed.

---
 .github/workflows/build-gcc.yml   | 4 ++++
 .github/workflows/build-macos.yml | 4 ++--
 .github/workflows/build-mingw.yml | 2 +-
 .github/workflows/build.yml       | 1 -
 scripts/merge.py                  | 1 +
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-gcc.yml b/.github/workflows/build-gcc.yml
index 4d3a51c..29e4b32 100644
--- a/.github/workflows/build-gcc.yml
+++ b/.github/workflows/build-gcc.yml
@@ -30,6 +30,7 @@ jobs:
 
     container:
       image: gcc:${{matrix.gcc_version}}
+      options: -v /usr/local:/host_usr_local
 
     steps:
       - uses: actions/checkout@v4
@@ -45,6 +46,9 @@ jobs:
         run: |
           echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
 
+      - name: CMake
+        run: echo "/host_usr_local/bin" >> $GITHUB_PATH
+
       - name: Configure
         run: >-
           cmake -B ${{ steps.strings.outputs.build-output-dir }}
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index fd17e6d..2b70457 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -21,8 +21,8 @@ jobs:
 
     strategy:
       matrix:
-        os: [ 'macos-14.5' ]
-        xcode: [ '15.4' ]
+        os: [ 'macos-12' ]
+        xcode: [ '14.1' ]
         build_type: [ Release ]
 
     env:
diff --git a/.github/workflows/build-mingw.yml b/.github/workflows/build-mingw.yml
index d4cd5c8..5537de8 100644
--- a/.github/workflows/build-mingw.yml
+++ b/.github/workflows/build-mingw.yml
@@ -33,7 +33,7 @@ jobs:
           - msystem: "MINGW64"
             install: >-
               git mingw-w64-x86_64-cmake
-              mingw-w64-x86_64-gcc mingw-w64-x86_64-g++
+              mingw-w64-x86_64-gcc
               mingw-w64-x86_64-ninja
 
     name: "On ${{matrix.os}} ${{matrix.config.msystem}} ${{matrix.build_type}}"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a8d8581..979d73b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -85,7 +85,6 @@ jobs:
         run: >-
           cmake --build ${{ steps.strings.outputs.build-output-dir }}
           --config ${{ matrix.build_type }}
-          -- -j ${{steps.cores.outputs.count}}
 
       - name: Test
         working-directory: ${{ steps.strings.outputs.build-output-dir }}
diff --git a/scripts/merge.py b/scripts/merge.py
index e1b0c2d..655dd8b 100644
--- a/scripts/merge.py
+++ b/scripts/merge.py
@@ -168,6 +168,7 @@ def list_header_files():
     headers = ['uvcxx/utils/standard.h']  # < first header should be standard
     for d in dirs:
         files = os.listdir(os.path.join(uvcxx, d))
+        files.sort()
         for file in files:
             ext = os.path.splitext(file)[-1]
             if ext.lower() != '.h':