.gitlab-ci.yml

@@ -18,26 +18,16 @@ stages:
     - ./cicd_testing/do-build.sh
     - ./cicd_testing/do-test.sh
 
-#
-# test
-#
+
 ubuntu22:
   <<: *do-test
   tags:
     - ubuntu22
 
-ubuntu20:
+ubuntu24:
   <<: *do-test
   tags:
-    - ubuntu20
-
-ubuntu18:
-  <<: *do-test
-  script:
-    - ./cicd_testing/do-clean.sh
-  tags:
-    - ubuntu18
-
+    - ubuntu24
 
 arm32:
   <<: *do-test
@@ -49,29 +39,26 @@ arm64:
   tags:
     - arm64
 
-coss9:
-  <<: *do-test
-  tags:
-    - coss9
 
 #
 # Fuzz
 #
-fuzz:
-  stage: fuzz
-  script:
-    - ./cicd_testing/do-fuzz.sh
-  artifacts:
-    paths: 
-      - artifacts
-    when: always
-  tags:
-    - fuzz
+#fuzz:
+#  stage: fuzz
+#  script:
+#    - ./cicd_testing/do-fuzz.sh
+#  artifacts:
+#    paths: 
+#      - artifacts
+#    when: always
+#  tags:
+#    - fuzz
 
 #
 # Deploy
 #
-ubuntu22:
+deploy:
+  needs: [ "arm32", "arm64",  "ubuntu22" ] # "fuzz"
   stage: deploy
   script:
     - ./cicd_testing/do-deploy.sh

src/SConscript

@@ -38,7 +38,7 @@ LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
 LIBS=Split("")
 
 myenv=myenv.Clone(CPPPATH=Split(cpppath))
-myenv.Append(CXXFLAGS = " -std=c++14 -Wall -Werror -fmax-errors=2 -fPIC ")
+myenv.Append(CXXFLAGS = " -std=c++17 -Wall -Werror -fmax-errors=2 -fPIC ")
 
 lib1=myenv.Library("ehp",  Split(files), LIBPATH=LIBPATH, LIBS=LIBS)
 install1=myenv.Install("../lib/", lib1)

test/SConscript

@@ -34,7 +34,7 @@ LIBS='''
 	ehp
 	'''
 myenv=myenv.Clone(CPPPATH=Split(cpppath))
-myenv.Append(CXXFLAGS = " -std=c++14 -Wall -Werror -fmax-errors=1 -g ")
+myenv.Append(CXXFLAGS = " -std=c++17 -Wall -Werror -fmax-errors=1 -g ")
 
 lib=myenv.Program("test.exe",  Split(files), LIBPATH=Split(LIBPATH), LIBS=Split(LIBS))
 Default(lib)