Merge pull request #11 from LightSys/develop

Complete tests 1-5 for all platforms

.github/workflows/build-and-test.yml

@@ -1,38 +1,29 @@
 name: build-and-test
-on: [push]
+on: [push, workflow_dispatch]
 jobs:
   build-and-test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - name: Build and install Abseil
+        if: always()
+        run: make abseil install-abseil
       - name: Cache protobuf library
         id: cache-protobuf
         uses: actions/cache@v1
         with:
           path: protobuf
           key: ${{ runner.os }}-protobuf
-      - name: Build protobuf library
-        if: steps.cache-protobuf.outputs.cache-hit != 'true'
-        run: |
-          git clone https://github.com/protocolbuffers/protobuf.git
-          cd protobuf
-          git submodule update --init --recursive
-          ./autogen.sh
-          ./autogen.sh  # run autogen twice due to alleged bug
-          ./configure
-          make
-          make check
-      - name: Install protobuf library
+      - name: Build Protobuf
         if: always()
-        run: |
-          cd protobuf
-          sudo make install
-          sudo ldconfig
-      - name: Build and test
+        run: make protobuf
+      - name: Install protobuf library
         if: always()
-        run: make all build-and-test USE_CORES=1
-      - uses: actions/upload-artifact@v2
+        run: make install-protobuf
+      - name: Build and test ADAK
         if: always()
+        run: make build-and-test USE_CORES=1
+      - uses: actions/upload-artifact@v4
         with:
           name: outputs
           path: build/src/outputs/

.gitignore

@@ -8,11 +8,16 @@ outputs/
 .vscode
 .clang-format
 logOutput.txt
-statslog.csv
-make.out
+statsLog.csv
+make*.out
 *.pyc
 *.zip
 clean-outputs
 .*.icloud
 .DS_Store
 .*.swp
+include/message.pb.h
+src/message.pb.cc
+googletest/
+abseil-cpp/
+protobuf/

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.5)
 
 # Project name
 project(ADAK_Keying)