From 3a9381b9664f124a81ec14dc2ec5fb7429d859d6 Mon Sep 17 00:00:00 2001 From: sh <37271604+shumvgolove@users.noreply.github.com> Date: Tue, 23 Sep 2025 08:08:56 +0000 Subject: [PATCH] ci/scripts: execute git version if chmod fails (#1643) --- .github/workflows/build.yml | 2 +- scripts/simplexmq-reproduce-builds.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 08e8d513b..12a1ad97b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -177,7 +177,7 @@ jobs: if: matrix.should_run == true shell: docker exec -t builder sh -eu {0} run: | - chmod -R 777 dist-newstyle ~/.cabal && git config --global --add safe.directory '*' + chmod -fR 777 ~/.cabal ./dist-newstyle || :; git config --global --add safe.directory '*' cabal clean cabal update cabal build --jobs=$(nproc) --enable-tests -fserver_postgres diff --git a/scripts/simplexmq-reproduce-builds.sh b/scripts/simplexmq-reproduce-builds.sh index 54fbfad8e..ec480b369 100755 --- a/scripts/simplexmq-reproduce-builds.sh +++ b/scripts/simplexmq-reproduce-builds.sh @@ -47,7 +47,7 @@ for os in 22.04 24.04; do docker exec \ -t \ builder \ - sh -c 'cabal update && cabal build --jobs=$(nproc) --enable-tests -fserver_postgres && mkdir -p /out && for i in smp-server simplexmq-test; do bin=$(find /project/dist-newstyle -name "$i" -type f -executable) && chmod +x "$bin" && mv "$bin" /out/; done && strip /out/smp-server' + sh -c 'git config --global --add safe.directory \*; cabal update && cabal build --jobs=$(nproc) --enable-tests -fserver_postgres && mkdir -p /out && for i in smp-server simplexmq-test; do bin=$(find /project/dist-newstyle -name "$i" -type f -executable) && chmod +x "$bin" && mv "$bin" /out/; done && strip /out/smp-server' # Copy smp-server postgresql binary and prepare it docker cp \