Skip to content

Commit 56ae958

Browse files
committed
changed folder names
1 parent 6e97edb commit 56ae958

27 files changed

+14
-14
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: actions/upload-artifact@v3
2929
with:
3030
name: linux-binary
31-
path: ${{github.workspace}}/build/src/libserialport.so
31+
path: ${{github.workspace}}/build/cpp/libserialport.so
3232

3333
build_windows:
3434
name: Build win64 binaries
@@ -47,7 +47,7 @@ jobs:
4747
uses: actions/upload-artifact@v3
4848
with:
4949
name: windows-binary
50-
path: ${{github.workspace}}\build\src\Release\serialport.dll
50+
path: ${{github.workspace}}\build\cpp\Release\serialport.dll
5151

5252
commit:
5353
needs: [build_windows, build_linux]
@@ -66,13 +66,13 @@ jobs:
6666
path: ${{github.workspace}}/tmp
6767

6868
- name: Create bin folder if it does not exist
69-
run: mkdir -p ${{github.workspace}}/lib/bin
69+
run: mkdir -p ${{github.workspace}}/ts/bin
7070

7171
- name: Move and rename linux binary
72-
run: mv ${{github.workspace}}/tmp/linux-binary/libserialport.so ${{github.workspace}}/lib/bin/linux.so
72+
run: mv ${{github.workspace}}/tmp/linux-binary/libserialport.so ${{github.workspace}}/ts/bin/linux.so
7373

7474
- name: Move and rename windows binary
75-
run: mv ${{github.workspace}}/tmp/windows-binary/serialport.dll ${{github.workspace}}/lib/bin/windows.dll
75+
run: mv ${{github.workspace}}/tmp/windows-binary/serialport.dll ${{github.workspace}}/ts/bin/windows.dll
7676

7777
- name: Configure Git
7878
run: |
@@ -81,7 +81,7 @@ jobs:
8181
8282
- name: Commit binaries
8383
run: |
84-
git add ${{github.workspace}}/lib/bin/*
84+
git add ${{github.workspace}}/ts/bin/*
8585
git diff-index --quiet HEAD || git commit -m "Commited compiled binaries"
8686
8787
- name: Push changes

.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
uses: actions/upload-artifact@v3
3535
with:
3636
name: linux-binary
37-
path: ${{github.workspace}}/build/src/libserialport.so
37+
path: ${{github.workspace}}/build/cpp/libserialport.so
3838

3939
build_windows:
4040
runs-on: windows-latest
@@ -52,7 +52,7 @@ jobs:
5252
uses: actions/upload-artifact@v3
5353
with:
5454
name: windows-binary
55-
path: ${{github.workspace}}\build\src\Release\serialport.dll
55+
path: ${{github.workspace}}\build\cpp\Release\serialport.dll
5656

5757
pre-release:
5858
needs: [build_windows, build_linux]
@@ -68,18 +68,18 @@ jobs:
6868
path: ${{github.workspace}}/tmp
6969

7070
- name: Rename linux Binary
71-
run: mv ${{github.workspace}}/tmp/linux-binary/libserialport.so ${{github.workspace}}/lib/bin/linux.so
71+
run: mv ${{github.workspace}}/tmp/linux-binary/libserialport.so ${{github.workspace}}/ts/bin/linux.so
7272

7373
- name: Rename windows Binary
74-
run: mv ${{github.workspace}}/tmp/windows-binary/serialport.dll ${{github.workspace}}/lib/bin/windows.dll
74+
run: mv ${{github.workspace}}/tmp/windows-binary/serialport.dll ${{github.workspace}}/ts/bin/windows.dll
7575

7676
- run: cd ${{github.workspace}}
7777

7878
- name: make .tar.gz file
79-
run: tar -czvf SerialLink-lib.tar.gz ./lib
79+
run: tar -czvf SerialLink-lib.tar.gz ./ts
8080

8181
- name: make .zip
82-
run: zip -r SerialLink-lib.zip ./lib
82+
run: zip -r SerialLink-lib.zip ./ts
8383

8484
- uses: "marvinpinto/action-automatic-releases@latest"
8585
with:

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ project(${PROJECT_N} VERSION 1.0)
66
set(CMAKE_CXX_STANDARD 20)
77
set(CMAKE_CXX_STANDARD_REQUIRED True)
88

9-
add_subdirectory(src)
9+
add_subdirectory(cpp)
1010

1111
target_include_directories(${PROJECT_N} PUBLIC include)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ MACRO(header_directories return_list includes_base_folder extention )
2525
ENDMACRO()
2626

2727
# using said macro.
28-
header_directories(INCLUDES ${PROJECT_SOURCE_DIR}/src/include/ h)
28+
header_directories(INCLUDES ${PROJECT_SOURCE_DIR}/cpp/include/ h)
2929

3030
message("src files:")
3131
foreach(file ${SRCS})
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)