Resolve Conflict

.github/workflows/build-ci.yaml

@@ -0,0 +1,46 @@
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+
+
+jobs:
+  build-linux:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: build
+      run: |
+        mkdir build && cd build && cmake .. && make
+    - uses: actions/upload-artifact@v3
+      with:
+        name: linux
+        path: build/json
+  build-windows:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: set up Msys2
+      uses: msys2/setup-msys2@v2
+      with:
+        msystem: ucrt64
+        install: >-
+         libiconv-devel
+         cmake
+         gcc
+         ninja
+         pkg-config
+          
+    - name: build
+      shell: msys2 {0}
+      run: |
+        mkdir build && cd build
+        cmake -G Ninja -DCMAKE_BUILD_TYPE=DEBUG .. && cmake --build .
+        pwd && ls
+        cd .. && pwd && ls
+    - uses: actions/upload-artifact@v3
+      with:
+        name: windows
+        path: build/json.exe
+

README.md

@@ -2,8 +2,7 @@
 
 ## json解析器
 
-[下载](https://github.com/undefined-ux/json-parser-homework/releases)
-
+[下载](https://github.com/undefined-ux/json-parser-homework/releases) [CI构建](https://github.com/undefined-ux/json-parser-homework/actions)
 
 [文档](https://undefined-ux.github.io/json-parser-homework)
 ### 命令行版本

cutest/CuTest.c

@@ -8,7 +8,7 @@
 #include <string.h>
 #include <math.h>
 
-#include "CuTest.h_bak"
+#include "CuTest.h"
 
 /*-------------------------------------------------------------------------*
  * CuStr

test/stringTest.c

@@ -1,4 +1,4 @@
-#include "..\cutest\CuTest.h_bak"
+#include "CuTest.h"
 
 int main() {