Compare commits
5 Commits
a6abf7250a
...
master
Author | SHA1 | Date | |
---|---|---|---|
|
6b5eebbe1e | ||
|
bae4ad1c92 | ||
|
2f967b086c | ||
|
8d3ff9ce78 | ||
|
9597742d81 |
10
.github/workflows/cd.yml
vendored
10
.github/workflows/cd.yml
vendored
@@ -14,7 +14,7 @@ jobs:
|
|||||||
linux-ubuntu:
|
linux-ubuntu:
|
||||||
timeout-minutes: 10
|
timeout-minutes: 10
|
||||||
|
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-24.04
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
@@ -25,7 +25,7 @@ jobs:
|
|||||||
run: sudo apt update && sudo apt -y install libsodium-dev
|
run: sudo apt update && sudo apt -y install libsodium-dev
|
||||||
|
|
||||||
- name: Configure CMake
|
- name: Configure CMake
|
||||||
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_FLAGS=-gz -DCMAKE_CXX_FLAGS=-gz
|
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_FLAGS=-gz -DCMAKE_CXX_FLAGS=-gz -DCMAKE_EXE_LINKER_FLAGS=-gz
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
|
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
|
||||||
@@ -46,15 +46,15 @@ jobs:
|
|||||||
- name: Compress artifacts
|
- name: Compress artifacts
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
tar -czvf ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu22.04-x86_64.tar.gz -C ${{github.workspace}}/build/bin/ .
|
tar -czvf ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu24.04-x86_64.tar.gz -C ${{github.workspace}}/build/bin/ .
|
||||||
|
|
||||||
- uses: actions/upload-artifact@v4
|
- uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
# TODO: simpler name?
|
# TODO: simpler name?
|
||||||
name: ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu22.04-x86_64
|
name: ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu24.04-x86_64
|
||||||
# TODO: do propper packing
|
# TODO: do propper packing
|
||||||
path: |
|
path: |
|
||||||
${{github.workspace}}/${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu22.04-x86_64.tar.gz
|
${{github.workspace}}/${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu24.04-x86_64.tar.gz
|
||||||
|
|
||||||
|
|
||||||
windows:
|
windows:
|
||||||
|
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -62,3 +62,6 @@
|
|||||||
[submodule "external/solanaceae_tox_p2prng"]
|
[submodule "external/solanaceae_tox_p2prng"]
|
||||||
path = external/solanaceae_tox_p2prng
|
path = external/solanaceae_tox_p2prng
|
||||||
url = https://github.com/Green-Sky/solanaceae_tox_p2prng.git
|
url = https://github.com/Green-Sky/solanaceae_tox_p2prng.git
|
||||||
|
[submodule "external/solanaceae_vcg"]
|
||||||
|
path = external/solanaceae_vcg
|
||||||
|
url = https://github.com/MadeOfJelly/solanaceae_vcg.git
|
||||||
|
4
external/CMakeLists.txt
vendored
4
external/CMakeLists.txt
vendored
@@ -49,5 +49,9 @@ add_subdirectory(./solanaceae_crdtnotes)
|
|||||||
set(SOLANACEAE_LLAMA-CPP-WEB_BUILD_PLUGINS ON CACHE BOOL "")
|
set(SOLANACEAE_LLAMA-CPP-WEB_BUILD_PLUGINS ON CACHE BOOL "")
|
||||||
add_subdirectory(./solanaceae_llama-cpp-web)
|
add_subdirectory(./solanaceae_llama-cpp-web)
|
||||||
|
|
||||||
|
set(SOLANACEAE_VCG_BUILD_PLUGINS ON CACHE BOOL "")
|
||||||
|
set(SOLANACEAE_VCG_BUILD_TESTING ${SOLANACEAE_ECOSYSTEM_BUILD_TESTING} CACHE BOOL "")
|
||||||
|
add_subdirectory(./solanaceae_vcg)
|
||||||
|
|
||||||
add_subdirectory(./totato)
|
add_subdirectory(./totato)
|
||||||
|
|
||||||
|
2
external/solanaceae_crdtnotes
vendored
2
external/solanaceae_crdtnotes
vendored
Submodule external/solanaceae_crdtnotes updated: 3bf46dcaba...b6a68c830e
2
external/solanaceae_llama-cpp-web
vendored
2
external/solanaceae_llama-cpp-web
vendored
Submodule external/solanaceae_llama-cpp-web updated: 39f714394b...a0d28fb516
2
external/solanaceae_ngc_ft1
vendored
2
external/solanaceae_ngc_ft1
vendored
Submodule external/solanaceae_ngc_ft1 updated: 0ad4c4997c...be9bb4e233
1
external/solanaceae_vcg
vendored
Submodule
1
external/solanaceae_vcg
vendored
Submodule
Submodule external/solanaceae_vcg added at 719aa75a67
Reference in New Issue
Block a user