Skip to content

Commit 7e80d61

Browse files
committed
Merge remote-tracking branch 'opcm-github/master' into main
Change-Id: I28fbcdf206fa7cd90277233ed0e6ae748fc3372e
2 parents 0fe57e3 + 56040dc commit 7e80d61

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

.github/workflows/macos-scan-build.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Mac OS X scan-build
22

33
on:
44
push:
5-
branches: [ macos-scan-build ]
5+
branches: [ master ]
66
pull_request:
7-
branches: [ macos-scan-build ]
7+
branches: [ master ]
88

99
jobs:
1010
build:
@@ -13,11 +13,16 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v2
16+
- name: install simdjson
17+
uses: actions/checkout@v2
18+
with:
19+
repository: simdjson/simdjson
20+
path: src/simdjson
1621
- name: cmake
1722
run: |
1823
rm -rf ${{ github.workspace }}/build
1924
/usr/local/opt/llvm/bin/scan-build cmake -B ${{ github.workspace }}/build -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}
2025
- name: make
2126
run: |
2227
cd ${{ github.workspace }}/build
23-
/usr/local/opt/llvm/bin/scan-build --exclude src/simdjson --status-bugs make -j
28+
/usr/local/opt/llvm/bin/scan-build --exclude src/simdjson --status-bugs make -j

.github/workflows/macosx_build.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v2
16+
- name: install simdjson
17+
uses: actions/checkout@v2
18+
with:
19+
repository: simdjson/simdjson
20+
path: src/simdjson
1621
- name: cmake
1722
run: |
1823
rm -rf ${{ github.workspace }}/build

0 commit comments

Comments
 (0)