From ccd5f087c7d08a0fd325f2139731700471bdef52 Mon Sep 17 00:00:00 2001 From: Michael Langmayr Date: Wed, 21 May 2025 14:33:53 -0700 Subject: [PATCH 1/3] Remove build artifacts and ignore them --- .gitignore | 3 +++ bin/.gitignore | 4 ---- build/.gitignore | 4 ---- lib/.gitignore | 4 ---- 4 files changed, 3 insertions(+), 12 deletions(-) delete mode 100644 bin/.gitignore delete mode 100644 build/.gitignore delete mode 100644 lib/.gitignore diff --git a/.gitignore b/.gitignore index f096120f..503b9378 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ .idea .vscode cmake-build* +/build/ +/lib/ +/bin/ diff --git a/bin/.gitignore b/bin/.gitignore deleted file mode 100644 index 5e7d2734..00000000 --- a/bin/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# Ignore everything in this directory -* -# Except this file -!.gitignore diff --git a/build/.gitignore b/build/.gitignore deleted file mode 100644 index 5e7d2734..00000000 --- a/build/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# Ignore everything in this directory -* -# Except this file -!.gitignore diff --git a/lib/.gitignore b/lib/.gitignore deleted file mode 100644 index 5e7d2734..00000000 --- a/lib/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# Ignore everything in this directory -* -# Except this file -!.gitignore From 62dd8ef77fd2a7b596330db97fb82b45cc397128 Mon Sep 17 00:00:00 2001 From: Michael Langmayr Date: Wed, 21 May 2025 14:42:10 -0700 Subject: [PATCH 2/3] fix git workflow --- .github/workflows/cmake-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake-workflow.yml b/.github/workflows/cmake-workflow.yml index f10b186f..584e6492 100644 --- a/.github/workflows/cmake-workflow.yml +++ b/.github/workflows/cmake-workflow.yml @@ -20,8 +20,8 @@ jobs: - name: Configure CMake for Archon Interface run: | + mkdir ${{github.workspace}}/build cd ${{github.workspace}}/build - rm -rf * cmake .. - name: Build From 8fbba3a2495672c0ba7657a50d10446f01d7a725 Mon Sep 17 00:00:00 2001 From: Michael Langmayr Date: Wed, 21 May 2025 14:56:00 -0700 Subject: [PATCH 3/3] remove e2e tests --- .github/workflows/cmake-workflow.yml | 29 ---------------------------- 1 file changed, 29 deletions(-) diff --git a/.github/workflows/cmake-workflow.yml b/.github/workflows/cmake-workflow.yml index 584e6492..9a6be648 100644 --- a/.github/workflows/cmake-workflow.yml +++ b/.github/workflows/cmake-workflow.yml @@ -34,32 +34,3 @@ jobs: run: | cd ${{github.workspace}} bin/run_unit_tests - - - name: Start Emulator - run: | - cd ${{github.workspace}} - bin/emulator Config/demo/demo.cfg -i generic & - - - name: Start camera-daemon - run: | - cd ${{github.workspace}} - bin/camerad Config/demo/demo.cfg --foreground & - - - name: Run E2E tests - run: | - cd ${{github.workspace}} - shopt -s expand_aliases - alias cam="bin/socksend -h localhost -p 3031" - function check { if [ $1 != "DONE" ]; then echo $1; exit 1; else echo $1; fi } - - command_open=$(cam open) - check $command_open - - command_load=$(cam load) - check $command_load - - command_expose=$(cam expose) - check $command_expose - - command_printstatus=$(cam printstatus) - check $command_printstatus