Skip to content

Commit 5336acd

Browse files
committed
static link as much as possible
1 parent d49cb40 commit 5336acd

2 files changed

Lines changed: 15 additions & 14 deletions

File tree

.github/workflows/build.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build Source
1+
name: Build Cubic Discord Bot
22

33
on:
44
push:
@@ -7,12 +7,12 @@ on:
77

88
jobs:
99
build:
10-
name: "Build"
10+
name: "Compile Source"
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v6
1414

15-
- uses: lukka/get-cmake@v4.3.2
15+
- uses: lukka/get-cmake@v4.3.3
1616

1717
- name: Setup vcpkg
1818
uses: lukka/run-vcpkg@v11
@@ -40,6 +40,15 @@ jobs:
4040
- name: Build
4141
run: cmake --build build --config Release -j$(nproc)
4242

43+
# i have no idea how else to get the runtime libs :(
44+
- name: Collect runtime libraries
45+
run: |
46+
ls -l vcpkg/packages/*_x64-linux/lib || true
47+
ldd build/CubicDiscord
48+
mkdir -p artifacts/libs
49+
cp vcpkg/packages/*_x64-linux/lib/*.so* artifacts/libs/ || true
50+
ls -l artifacts/libs || true
51+
4352
- name: Save vcpkg cache
4453
if: always()
4554
uses: actions/cache/save@v5
@@ -80,7 +89,7 @@ jobs:
8089
- name: Publish Nightly release
8190
id: publish-nightly
8291
if: ${{ github.ref_name == github.event.repository.default_branch }}
83-
uses: andelf/nightly-release@main
92+
uses: andelf/nightly-release@v1
8493
env:
8594
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8695
with:

CMakeLists.txt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,20 @@ include(cmake/CPM.cmake)
99
option(CUBIC_LOCAL_BUILD "Enable local testing mode" OFF)
1010
if(CUBIC_LOCAL_BUILD)
1111
target_compile_definitions(${PROJECT_NAME} PRIVATE CUBIC_LOCAL_BUILD=1)
12-
find_package(dpp CONFIG REQUIRED)
13-
14-
target_link_libraries(${PROJECT_NAME} PRIVATE
15-
dpp::dpp
16-
)
1712
else() # for ci
18-
CPMAddPackage("gh:brainboxdotcc/DPP#v10.1.5")
19-
target_link_libraries(${PROJECT_NAME} PRIVATE
20-
dpp
21-
)
22-
2313
target_link_options(${PROJECT_NAME} PRIVATE
2414
-static
2515
-static-libgcc
2616
-static-libstdc++
2717
)
2818
endif()
2919

20+
find_package(dpp CONFIG REQUIRED)
3021
find_package(re2 CONFIG REQUIRED)
3122

3223
target_link_libraries(${PROJECT_NAME} PRIVATE
3324
re2::re2
25+
dpp::dpp
3426
)
3527

3628
CPMAddPackage("gh:dankmeme01/asp2#main")

0 commit comments

Comments
 (0)