Switching to a newer testing image with a fresher php (#61)

manticoresoftware · May 17, 2024 · c0fc9bc · c0fc9bc
1 parent f1d9d9f
commit c0fc9bc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/build_template.yml b/.github/workflows/build_template.yml
@@ -10,7 +10,7 @@ on:
       DISTR:
         required: false
         type: string
-        default: bionic
+        default: jammy
       CTEST_CMAKE_GENERATOR:
         required: false
         type: string

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -58,7 +58,6 @@ jobs:
         run: |
           wget https://repo.manticoresearch.com/repository/ci/boost_1_75_0.tgz
           tar -xf boost_1_75_0.tgz
-
   build_linux_release:
     name: Linux release build
     uses: ./.github/workflows/build_template.yml

diff --git a/.github/workflows/test_template.yml b/.github/workflows/test_template.yml
@@ -40,7 +40,7 @@ jobs:
       run:
         shell: bash
     container:
-      image: manticoresearch/ubertests_ctest:3263 #
+      image: manticoresearch/ubertests_ctest:3263_mar_2024
       env:
         DIAGNOSTIC: 1
         CACHEB: ../cache
@@ -62,7 +62,7 @@ jobs:
       - name: Download build artifacts
         uses: manticoresoftware/download_artifact_with_retries@v2
         with:
-          name: build_bionic_${{ inputs.CTEST_CONFIGURATION_TYPE }}_x86_64
+          name: build_jammy_${{ inputs.CTEST_CONFIGURATION_TYPE }}_x86_64
           path: .
 
       - name: Check out main cache before building

diff --git a/cmake/rev.cmake b/cmake/rev.cmake
@@ -11,6 +11,10 @@ function ( guess_from_git )
 		return ()
 	endif ()
 
+	# without this in some environments you can get error "detected dubious ownership in repository"
+	# `git config --global --add safe.directory '*'` in the docker image it runs in may not help. TODO: check why
+  execute_process ( COMMAND "${GIT_EXECUTABLE}" config --global --add safe.directory "${columnar_SOURCE_DIR}")
+
 	# extract short hash as GIT_COMMIT_ID
 	execute_process ( COMMAND "${GIT_EXECUTABLE}" log -1 --format=%h
 			WORKING_DIRECTORY "${columnar_SOURCE_DIR}"
@@ -21,16 +25,14 @@ function ( guess_from_git )
 	set ( GIT_COMMIT_ID "${GIT_COMMIT_ID}" PARENT_SCOPE )
 
 	# extract timestamp and make number YYMMDD from it
-	# it would be --date=format:%y%m%d, but old git on centos doesn't understand it
-	execute_process ( COMMAND "${GIT_EXECUTABLE}" log -1 --date=short --format=%cd
+	execute_process ( COMMAND "${GIT_EXECUTABLE}" log -1 --date=format-local:"%y%m%d%H" --format=%cd
 			WORKING_DIRECTORY "${columnar_SOURCE_DIR}"
 			RESULT_VARIABLE res
 			OUTPUT_VARIABLE GIT_TIMESTAMP_ID
-			ERROR_QUIET
 			OUTPUT_STRIP_TRAILING_WHITESPACE )
-	string ( REPLACE "-" "" GIT_TIMESTAMP_ID "${GIT_TIMESTAMP_ID}" )
-	string ( SUBSTRING "${GIT_TIMESTAMP_ID}" 2 -1 GIT_TIMESTAMP_ID )
-	set ( GIT_TIMESTAMP_ID "${GIT_TIMESTAMP_ID}" PARENT_SCOPE )
+
+	string ( SUBSTRING "${GIT_TIMESTAMP_ID}" 1 8 GIT_TIMESTAMP_ID )
+	set ( GIT_TIMESTAMP_ID ${GIT_TIMESTAMP_ID} PARENT_SCOPE )
 
 	# timestamp for reproducable packages
 	execute_process ( COMMAND "${GIT_EXECUTABLE}" log -1 --pretty=%ct