Merge branch 'master' into error-on-watch-when-delete-source-not-specified

Author: Slach

ChangeLog.md

@@ -135,7 +135,7 @@ IMPROVEMENTS
 
 
 BUG FIXES
-- after drop table, before create table, will check if replica path already exists, and will try to, helpfull for restoring Replicated tables which not contains macros in replication parameters fix [849](https://github.com/Altinity/clickhouse-backup/issues/849)
+- after drop table, before create table, will check if replica path already exists, and will try to change `replication_patch`, it helpful for restoring Replicated tables which not contains macros in replication parameters fix [849](https://github.com/Altinity/clickhouse-backup/issues/849)
 - fix `TestLongListRemote` for properly time measurement
 - fix log_pointer handle from system.replicas during restore, fix [967](https://github.com/Altinity/clickhouse-backup/issues/967)
 - fix `use_embedded_backup_restore: true` behavior for azblob, fix [1031](https://github.com/Altinity/clickhouse-backup/issues/1031)

Dockerfile

@@ -16,7 +16,13 @@ RUN rm -fv /etc/apt/sources.list.d/clickhouse.list && \
     echo "deb-src https://ppa.launchpadcontent.net/longsleep/golang-backports/ubuntu ${DISTRIB_CODENAME} main" >> /etc/apt/sources.list.d/golang.list && \
     ( apt-get update || true ) && \
     apt-get install -y --no-install-recommends libc-dev golang-1.24 make git gcc musl-dev musl-tools && \
-    wget -q -P /root/ https://musl.cc/aarch64-linux-musl-cross.tgz && \
+# todo ugly fix for ugly fix, musl.cc is not available from github runner \
+    DISTRIB_RELEASE=$(cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -d "=" -f 2) && \
+    echo ${DISTRIB_RELEASE} && \
+    wget -nv -O /tmp/megacmd.deb https://mega.nz/linux/repo/xUbuntu_${DISTRIB_RELEASE}/amd64/megacmd-xUbuntu_${DISTRIB_RELEASE}_amd64.deb && \
+    apt install -y "/tmp/megacmd.deb" && \
+    mega-get https://mega.nz/file/zQwVHSYb#8WqqMUCTbbEVKDW55NPrRnM2-4SC-numNCLDKoTWtwQ /root/ && \
+#    wget -nv -P /root/ https://musl.cc/aarch64-linux-musl-cross.tgz && \
     tar -xvf /root/aarch64-linux-musl-cross.tgz -C /root/ && \
     mkdir -p /root/go/
 

Makefile

@@ -61,9 +61,12 @@ build/linux/amd64/$(NAME)-fips build/darwin/amd64/$(NAME)-fips:
 	grep '_Cfunc__goboringcrypto_' /tmp/$(NAME)-fips-tags.txt 1> /dev/null && \
 	rm -fv /tmp/$(NAME)-fips-tags.txt
 
-# TODO remove ugly workaround, https://www.perplexity.ai/search/2ead4c04-060a-4d78-a75f-f26835238438
+# @TODO remove ugly workaround, https://www.perplexity.ai/search/2ead4c04-060a-4d78-a75f-f26835238438
+# @todo ugly fix for ugly fix, musl.cc is not available from github runner
+#	bash -xce 'if [[ ! -f ~/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc ]]; then wget -nv -P ~ https://musl.cc/aarch64-linux-musl-cross.tgz; tar -xvf ~/aarch64-linux-musl-cross.tgz -C ~; fi' && \
+
 build/linux/arm64/$(NAME)-fips build/darwin/arm64/$(NAME)-fips:
-	bash -xce 'if [[ ! -f ~/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc ]]; then wget -q -P ~ https://musl.cc/aarch64-linux-musl-cross.tgz; tar -xvf ~/aarch64-linux-musl-cross.tgz -C ~; fi' && \
+	bash -xce 'if [[ ! -f ~/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc ]]; then rm -rf ~/aarch64-linux-musl-cross; wget -nv -O /tmp/megacmd.deb https://mega.nz/linux/repo/xUbuntu_$(shell bash -c 'cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -d "=" -f 2')/amd64/megacmd-xUbuntu_$(shell bash -c 'cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -d "=" -f 2')_amd64.deb; if command -v sudo >/dev/null 2>&1; then sudo apt install -y /tmp/megacmd.deb; else apt install -y /tmp/megacmd.deb; fi; mega-get https://mega.nz/file/zQwVHSYb#8WqqMUCTbbEVKDW55NPrRnM2-4SC-numNCLDKoTWtwQ ~/; tar -xvf ~/aarch64-linux-musl-cross.tgz -C ~; fi' && \
 	CC=~/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc GOEXPERIMENT=boringcrypto CGO_ENABLED=1 GOOS=$(GOOS) GOARCH=$(GOARCH) $(GO_BUILD_STATIC_FIPS) -o $@ ./cmd/$(NAME) && \
 	go tool nm $@ > /tmp/$(NAME)-fips-tags.txt && \
 	grep '_Cfunc__goboringcrypto_' /tmp/$(NAME)-fips-tags.txt 1> /dev/null && \