Skip to content

Commit

Permalink
Merge pull request #337 from foundriesio/remove-custom-sota-example
Browse files Browse the repository at this point in the history
examples: Remove custom sota client example
  • Loading branch information
mike-sul authored Jul 12, 2024
2 parents 13aeb6b + acfdea0 commit 64a64f1
Show file tree
Hide file tree
Showing 9 changed files with 1 addition and 682 deletions.
21 changes: 0 additions & 21 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,6 @@ jobs:
- name: tidy
run: make -f dev-flow.mk tidy

custom-client:
name: Install Akite and Build Custom Client
runs-on: ubuntu-latest
container:
image: foundries/aklite-dev
options: --privileged
env:
CXX: clang++
CC: clang
CCACHE_DIR: /tmp/ccache
steps:
- uses: actions/checkout@v3
- run: git config --global --add safe.directory /__w/aktualizr-lite/aktualizr-lite
- run: git submodule update --init --recursive
- name: build
run: make -f dev-flow.mk config build
- name: install
run: sudo make -f dev-flow.mk install
- name: custom-client
run: make -f dev-flow.mk custom-client

garage-tools:
name: Build Garage Tools
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ GTEST_FILTER ?= "*"
PKCS11_ENGINE_PATH ?= "/usr/lib/x86_64-linux-gnu/engines-3/pkcs11.so"


TASKS = config build format tidy garage-tools custom-client test-uptane-vectors
TASKS = config build format tidy garage-tools test-uptane-vectors
.PHONY: $(TASKS) test


Expand Down
4 changes: 0 additions & 4 deletions dev-flow.mk
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ install:
cmake --build ${BUILD_DIR} --target $@
cp -r aktualizr/third_party/jsoncpp/include/json /usr/include

custom-client:
cmake -S examples/custom-client-cxx -B ${BUILD_DIR}-custom -GNinja -DCMAKE_CXX_COMPILER=${CXX} -DCMAKE_C_COMPILER=${CC} -DCMAKE_CXX_FLAGS="-I $(CURDIR)/include -I $(CURDIR)/aktualizr/third_party/jsoncpp/include/ -L "$(CURDIR)/${BUILD_DIR}/aktualizr/src/libaktualizr/" -L $(CURDIR)/${BUILD_DIR}/src"
cmake --build ${BUILD_DIR}-custom --target all

garage-tools:
cmake -S . -B ${BUILD_DIR}-garage -DCMAKE_BUILD_TYPE=Debug -GNinja -DBUILD_P11=ON -DBUILD_SOTA_TOOLS=ON -DCMAKE_CXX_COMPILER=${CXX} -DCMAKE_C_COMPILER=${CC} -DCMAKE_CXX_FLAGS="-Wno-error=deprecated-declarations" -DPKCS11_ENGINE_PATH=${PKCS11_ENGINE_PATH}
cmake --build ${BUILD_DIR}-garage --target all
18 changes: 0 additions & 18 deletions examples/custom-client-cxx/CMakeLists.txt

This file was deleted.

215 changes: 0 additions & 215 deletions examples/custom-client-cxx/cli.cpp

This file was deleted.

12 changes: 0 additions & 12 deletions examples/custom-client-cxx/cli.h

This file was deleted.

Loading

0 comments on commit 64a64f1

Please sign in to comment.