From c789c3f1d12d9fd0736e1b6ea0a58eedb6548b16 Mon Sep 17 00:00:00 2001 From: Melroy van den Berg Date: Wed, 2 Oct 2024 19:43:34 +0200 Subject: [PATCH] Avoid .c, .d and .o files from being copied to the binary tar.gz releases (#1106) As discussed here: https://github.com/orgs/valkey-io/discussions/1103#discussioncomment-10814006 `cp` can't be used anymore, `rsync` is more powerful and allow to exclude files. Alternatively: 1. Remove the c, d and o files. Which isn't ideal either. 2. Improve the build. Eg. by building inside a `build` directory instead of in the src folder. Ps. I know these workflows aren't trigger in this PR. Only via "Build Release Packages" workflow action: https://github.com/valkey-io/valkey/actions/workflows/build-release-packages.yml.. So I can't fully test in this PR. But it should work ^^ Ps. ps. I did test `rsync -av --exclude='*.c' --exclude='*.d' --exclude='*.o' src/valkey-*` command in isolation and that works as expected! --------- Signed-off-by: Melroy van den Berg --- .github/workflows/call-build-linux-arm-packages.yml | 6 +++--- .github/workflows/call-build-linux-x86-packages.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/call-build-linux-arm-packages.yml b/.github/workflows/call-build-linux-arm-packages.yml index db987b3816..96b359fa4a 100644 --- a/.github/workflows/call-build-linux-arm-packages.yml +++ b/.github/workflows/call-build-linux-arm-packages.yml @@ -57,9 +57,9 @@ jobs: - name: Create Tarball and SHA256sums run: | TAR_FILE_NAME=valkey-${{inputs.version}}-${{matrix.distro.platform}}-${{ matrix.distro.arch}} - mkdir -p $TAR_FILE_NAME/bin $TAR_FILE_NAME/share - cp -rfv src/valkey-* $TAR_FILE_NAME/bin - cp -v /home/runner/work/valkey/valkey/COPYING $TAR_FILE_NAME/share/LICENSE + mkdir -p "$TAR_FILE_NAME/bin" "$TAR_FILE_NAME/share" + rsync -av --exclude='*.c' --exclude='*.d' --exclude='*.o' src/valkey-* "$TAR_FILE_NAME/bin/" + cp -v /home/runner/work/valkey/valkey/COPYING "$TAR_FILE_NAME/share/LICENSE" tar -czvf $TAR_FILE_NAME.tar.gz $TAR_FILE_NAME sha256sum $TAR_FILE_NAME.tar.gz > $TAR_FILE_NAME.tar.gz.sha256 mkdir -p packages-files diff --git a/.github/workflows/call-build-linux-x86-packages.yml b/.github/workflows/call-build-linux-x86-packages.yml index 59c9fac52f..d256db6179 100644 --- a/.github/workflows/call-build-linux-x86-packages.yml +++ b/.github/workflows/call-build-linux-x86-packages.yml @@ -55,9 +55,9 @@ jobs: - name: Create Tarball and SHA256sums run: | TAR_FILE_NAME=valkey-${{inputs.version}}-${{matrix.distro.platform}}-${{ matrix.distro.arch}} - mkdir -p $TAR_FILE_NAME/bin $TAR_FILE_NAME/share - cp -rfv src/valkey-* $TAR_FILE_NAME/bin - cp -v /home/runner/work/valkey/valkey/COPYING $TAR_FILE_NAME/share/LICENSE + mkdir -p "$TAR_FILE_NAME/bin" "$TAR_FILE_NAME/share" + rsync -av --exclude='*.c' --exclude='*.d' --exclude='*.o' src/valkey-* "$TAR_FILE_NAME/bin/" + cp -v /home/runner/work/valkey/valkey/COPYING "$TAR_FILE_NAME/share/LICENSE" tar -czvf $TAR_FILE_NAME.tar.gz $TAR_FILE_NAME sha256sum $TAR_FILE_NAME.tar.gz > $TAR_FILE_NAME.tar.gz.sha256 mkdir -p packages-files