Skip to content

Commit

Permalink
fix ci failed.
Browse files Browse the repository at this point in the history
  • Loading branch information
levalup committed Jul 1, 2024
1 parent 38d5537 commit b37f767
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/build-gcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:

container:
image: gcc:${{matrix.gcc_version}}
options: -v /usr/local:/host_usr_local

steps:
- uses: actions/checkout@v4
Expand All @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:

strategy:
matrix:
os: [ 'macos-14.5' ]
xcode: [ '15.4' ]
os: [ 'macos-12' ]
xcode: [ '14.1' ]
build_type: [ Release ]

env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-mingw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}"
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
1 change: 1 addition & 0 deletions scripts/merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -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':
Expand Down

0 comments on commit b37f767

Please sign in to comment.