Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switching to newer testing image with a fresher php #61

Merged
merged 9 commits into from
May 17, 2024
Merged

Switching to newer testing image with a fresher php #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
611b64f
test
sanikolaev May 16, 2024
4d7c162
fix
sanikolaev May 16, 2024
d7b0e98
fix
sanikolaev May 16, 2024
fae8748
fix
sanikolaev May 16, 2024
52d1d52
fix
sanikolaev May 17, 2024
e067b45
fix
sanikolaev May 17, 2024
124fdc7
Merge branch 'master' into ci-may17
sanikolaev May 17, 2024
6d196f7
fix
sanikolaev May 17, 2024
89e2343
fix
sanikolaev May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
DISTR:
required: false
type: string
default: bionic
default: jammy
CTEST_CMAKE_GENERATOR:
required: false
type: string
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
14 changes: 8 additions & 6 deletions cmake/rev.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand All @@ -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
Expand Down
Loading