From 597c1ab4ae379b0ff1d8e46589bb5599a23ceb71 Mon Sep 17 00:00:00 2001 From: Don Hardman Date: Mon, 8 Sep 2025 14:48:09 +0700 Subject: [PATCH 1/3] ci: prevent fetching git submodules without permissions in CI --- testing.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing.cmake b/testing.cmake index 8b5aabe9..41dd7299 100644 --- a/testing.cmake +++ b/testing.cmake @@ -55,8 +55,8 @@ message ( STATUS "MANTICORE_LOCATOR before configure: '${MANTICORE_LOCATOR}'" ) string ( CONFIGURE "${MANTICORE_LOCATOR}" MANTICORE_LOCATOR ) # that is to expand possible inside variables message ( STATUS "MANTICORE_LOCATOR after configure: '${MANTICORE_LOCATOR}'" ) -file ( WRITE "${columnar_BINARY_DIR}/manticore-get.cmake" "FetchContent_Declare ( manticore ${MANTICORE_LOCATOR} )\n" ) -message ( STATUS "Written to ${columnar_BINARY_DIR}/manticore-get.cmake: 'FetchContent_Declare ( manticore ${MANTICORE_LOCATOR} )'" ) +file ( WRITE "${columnar_BINARY_DIR}/manticore-get.cmake" "FetchContent_Declare ( manticore ${MANTICORE_LOCATOR} GIT_SUBMODULES \"\" )\n" ) +message ( STATUS "Written to ${columnar_BINARY_DIR}/manticore-get.cmake: 'FetchContent_Declare ( manticore ${MANTICORE_LOCATOR} GIT_SUBMODULES \"\" )'" ) include ( FetchContent ) include ( "${columnar_BINARY_DIR}/manticore-get.cmake" ) From f9ac6871696a2d42756e4d17675db96b479f035c Mon Sep 17 00:00:00 2001 From: Don Hardman Date: Tue, 9 Sep 2025 09:46:58 +0700 Subject: [PATCH 2/3] ci: add GIT_SUBMODULES to manticore_locator in workflows --- .github/workflows/nightly_no_avx2.yml | 6 +++--- .github/workflows/pack_publish.yml | 6 +++--- .github/workflows/test.yml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/nightly_no_avx2.yml b/.github/workflows/nightly_no_avx2.yml index 1137de14..05ecb1a0 100644 --- a/.github/workflows/nightly_no_avx2.yml +++ b/.github/workflows/nightly_no_avx2.yml @@ -68,10 +68,10 @@ jobs: id: set_locator run: | if [[ "${{ github.event.schedule }}" == "00 20 * * *" ]]; then - echo "manticore_locator=GIT_REPOSITORY https://github.com/manticoresoftware/manticoresearch.git GIT_TAG master" >> $GITHUB_OUTPUT + echo "manticore_locator=GIT_REPOSITORY https://github.com/manticoresoftware/manticoresearch.git GIT_TAG master GIT_SUBMODULES \"\"" >> $GITHUB_OUTPUT echo "Set manticore_locator: GIT_REPOSITORY https://github.com/manticoresoftware/manticoresearch.git GIT_TAG master" elif [[ "${{ github.ref_name }}" != "master" && "${{ steps.check_branch.outputs.branch_exists }}" == "true" ]]; then - echo "manticore_locator=GIT_REPOSITORY https://github.com/manticoresoftware/manticoresearch.git GIT_TAG ${{ steps.check_branch.outputs.branch_name }}" >> $GITHUB_OUTPUT + echo "manticore_locator=GIT_REPOSITORY https://github.com/manticoresoftware/manticoresearch.git GIT_TAG ${{ steps.check_branch.outputs.branch_name }} GIT_SUBMODULES \"\"" >> $GITHUB_OUTPUT echo "Set manticore_locator: GIT_REPOSITORY https://github.com/manticoresoftware/manticoresearch.git GIT_TAG ${{ steps.check_branch.outputs.branch_name }}" else echo "manticore_locator=" >> $GITHUB_OUTPUT @@ -223,4 +223,4 @@ jobs: uses: manticoresoftware/upload_artifact_with_retries@v4 with: name: no_avx2_release_test_resuls - path: build \ No newline at end of file + path: build diff --git a/.github/workflows/pack_publish.yml b/.github/workflows/pack_publish.yml index eb2f279e..5e76d26d 100644 --- a/.github/workflows/pack_publish.yml +++ b/.github/workflows/pack_publish.yml @@ -110,9 +110,9 @@ jobs: id: set_locator run: | if [[ "${{ github.event.schedule }}" == "00 20 * * *" ]]; then - echo "manticore_locator=GIT_REPOSITORY https://github.com/manticoresoftware/manticoresearch.git GIT_TAG master" >> $GITHUB_OUTPUT + echo "manticore_locator=GIT_REPOSITORY https://github.com/manticoresoftware/manticoresearch.git GIT_TAG master GIT_SUBMODULES \"\"" >> $GITHUB_OUTPUT elif [[ "${{ github.ref_name }}" != "master" && "${{ steps.check_branch.outputs.branch_exists }}" == "true" ]]; then - echo "manticore_locator=GIT_REPOSITORY https://github.com/manticoresoftware/manticoresearch.git GIT_TAG ${{ steps.check_branch.outputs.branch_name }}" >> $GITHUB_OUTPUT + echo "manticore_locator=GIT_REPOSITORY https://github.com/manticoresoftware/manticoresearch.git GIT_TAG ${{ steps.check_branch.outputs.branch_name }} GIT_SUBMODULES \"\"" >> $GITHUB_OUTPUT else echo "manticore_locator=" >> $GITHUB_OUTPUT fi @@ -360,4 +360,4 @@ jobs: with: name: mcl version: ${{ needs.pack.outputs.version_full }} - token: ${{ secrets.PR_TOKEN }} \ No newline at end of file + token: ${{ secrets.PR_TOKEN }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e7ca13a0..b6fe035e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -70,10 +70,10 @@ jobs: id: set_locator run: | if [[ "${{ github.event.schedule }}" == "00 20 * * *" ]]; then - echo "manticore_locator=GIT_REPOSITORY https://github.com/manticoresoftware/manticoresearch.git GIT_TAG master" >> $GITHUB_OUTPUT + echo "manticore_locator=GIT_REPOSITORY https://github.com/manticoresoftware/manticoresearch.git GIT_TAG master GIT_SUBMODULES \"\"" >> $GITHUB_OUTPUT echo "Set manticore_locator: GIT_REPOSITORY https://github.com/manticoresoftware/manticoresearch.git GIT_TAG master" elif [[ "${{ github.ref_name }}" != "master" && "${{ steps.check_branch.outputs.branch_exists }}" == "true" ]]; then - echo "manticore_locator=GIT_REPOSITORY https://github.com/manticoresoftware/manticoresearch.git GIT_TAG ${{ steps.check_branch.outputs.branch_name }}" >> $GITHUB_OUTPUT + echo "manticore_locator=GIT_REPOSITORY https://github.com/manticoresoftware/manticoresearch.git GIT_TAG ${{ steps.check_branch.outputs.branch_name }} GIT_SUBMODULES \"\"" >> $GITHUB_OUTPUT echo "Set manticore_locator: GIT_REPOSITORY https://github.com/manticoresoftware/manticoresearch.git GIT_TAG ${{ steps.check_branch.outputs.branch_name }}" else echo "manticore_locator=" >> $GITHUB_OUTPUT From 09a66b248cd04fb3da29b633a01bea2afd33a7c4 Mon Sep 17 00:00:00 2001 From: Don Hardman Date: Tue, 9 Sep 2025 09:47:05 +0700 Subject: [PATCH 3/3] Revert "ci: prevent fetching git submodules without permissions in CI" This reverts commit 597c1ab4ae379b0ff1d8e46589bb5599a23ceb71. --- testing.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing.cmake b/testing.cmake index 41dd7299..8b5aabe9 100644 --- a/testing.cmake +++ b/testing.cmake @@ -55,8 +55,8 @@ message ( STATUS "MANTICORE_LOCATOR before configure: '${MANTICORE_LOCATOR}'" ) string ( CONFIGURE "${MANTICORE_LOCATOR}" MANTICORE_LOCATOR ) # that is to expand possible inside variables message ( STATUS "MANTICORE_LOCATOR after configure: '${MANTICORE_LOCATOR}'" ) -file ( WRITE "${columnar_BINARY_DIR}/manticore-get.cmake" "FetchContent_Declare ( manticore ${MANTICORE_LOCATOR} GIT_SUBMODULES \"\" )\n" ) -message ( STATUS "Written to ${columnar_BINARY_DIR}/manticore-get.cmake: 'FetchContent_Declare ( manticore ${MANTICORE_LOCATOR} GIT_SUBMODULES \"\" )'" ) +file ( WRITE "${columnar_BINARY_DIR}/manticore-get.cmake" "FetchContent_Declare ( manticore ${MANTICORE_LOCATOR} )\n" ) +message ( STATUS "Written to ${columnar_BINARY_DIR}/manticore-get.cmake: 'FetchContent_Declare ( manticore ${MANTICORE_LOCATOR} )'" ) include ( FetchContent ) include ( "${columnar_BINARY_DIR}/manticore-get.cmake" )