The branch, master has been updated via 804411b7 Get rid of gensend target & cached git version. via 0b1b2a3f Get the "dev" suffix right. via 50bdf968 Remove duplicate paragraph. via 3f2a38b0 CI: added Solaris build from 5510255f Tweak maintainer messaging.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 804411b7fd006d6a399a2b917b508259a752cfed Author: Wayne Davison <wa...@opencoder.net> Date: Wed Apr 10 12:15:49 2024 -0700 Get rid of gensend target & cached git version. - Change the developer flow to not require updating the git-version repo that the builds used to download a git-version.h file. The Actions now do a full repo fetch so that the .h file can be generated via the git history. - Get rid of the gensend Makefile target that was used for the above. - Get rid of the pre-push git hook file that called "Make gensend". - Change the FreeBSD build to save an artifact with its built binaries. [buildall] commit 0b1b2a3ff4b01b7ad6be5defe49172f04a0f7082 Author: Wayne Davison <wa...@opencoder.net> Date: Wed Apr 10 11:53:07 2024 -0700 Get the "dev" suffix right. commit 50bdf9685dc823ef9930c6ca862ac1588f815970 Author: Wayne Davison <wa...@opencoder.net> Date: Wed Apr 10 11:51:59 2024 -0700 Remove duplicate paragraph. commit 3f2a38b01184cae9a931280b534acf5a3dae2e94 Author: Charalampos Mitrodimas <charmi...@posteo.net> Date: Mon Apr 8 11:40:02 2024 +0300 CI: added Solaris build Signed-off-by: Charalampos Mitrodimas <charmi...@posteo.net> ----------------------------------------------------------------------- Summary of changes: .github/workflows/build.yml | 16 ++++++++-------- .github/workflows/freebsd-build.yml | 13 +++++++++++-- .../workflows/{freebsd-build.yml => solaris-build.yml} | 15 ++++++++------- Makefile.in | 8 -------- README.md | 3 --- packaging/auto-Makefile | 2 +- packaging/pkglib.py | 11 ----------- packaging/pre-push | 16 ---------------- packaging/release-rsync | 2 -- version.h | 2 +- 10 files changed, 29 insertions(+), 59 deletions(-) copy .github/workflows/{freebsd-build.yml => solaris-build.yml} (62%) delete mode 100755 packaging/pre-push Changeset truncated at 500 lines: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9273e11a..09a8ce24 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,11 +13,11 @@ jobs: ubuntu-build: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + fetch-depth: 0 - name: prep run: | - sudo apt-get install acl libacl1-dev attr libattr1-dev liblz4-dev libzstd-dev libxxhash-dev python3-cmarkgfm openssl wget - wget -O git-version.h https://gist.githubusercontent.com/WayneD/c11243fa374fc64d4e42f2855c8e3827/raw/rsync-git-version.h + sudo apt-get install acl libacl1-dev attr libattr1-dev liblz4-dev libzstd-dev libxxhash-dev python3-cmarkgfm openssl echo "/usr/local/bin" >>$GITHUB_PATH - name: configure run: ./configure --with-rrsync @@ -51,12 +51,12 @@ jobs: macos-build: runs-on: macos-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + fetch-depth: 0 - name: prep run: | - brew install automake openssl xxhash zstd lz4 wget + brew install automake openssl xxhash zstd lz4 sudo pip3 install commonmark - wget -O git-version.h https://gist.githubusercontent.com/WayneD/c11243fa374fc64d4e42f2855c8e3827/raw/rsync-git-version.h echo "/usr/local/bin" >>$GITHUB_PATH - name: configure run: CPPFLAGS=-I/usr/local/opt/openssl/include/ LDFLAGS=-L/usr/local/opt/openssl/lib/ ./configure --with-rrsync @@ -87,13 +87,13 @@ jobs: runs-on: windows-2022 if: (github.event_name == 'schedule' || contains(github.event.head_commit.message, '[buildall]')) steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + fetch-depth: 0 - name: cygwin run: choco install -y --no-progress cygwin cyg-get - name: prep run: | cyg-get make autoconf automake gcc-core attr libattr-devel python39 python39-pip libzstd-devel liblz4-devel libssl-devel libxxhash0 libxxhash-devel - curl.exe -o git-version.h https://gist.githubusercontent.com/WayneD/c11243fa374fc64d4e42f2855c8e3827/raw/rsync-git-version.h echo "C:/tools/cygwin/bin" >>$Env:GITHUB_PATH - name: commonmark run: bash -c 'python3 -mpip install --user commonmark' diff --git a/.github/workflows/freebsd-build.yml b/.github/workflows/freebsd-build.yml index 747bc35b..0fb5adb0 100644 --- a/.github/workflows/freebsd-build.yml +++ b/.github/workflows/freebsd-build.yml @@ -12,16 +12,25 @@ jobs: name: Test rsync on FreeBSD steps: - uses: actions/checkout@v4 + fetch-depth: 0 - name: Test in FreeBSD id: test uses: vmactions/freebsd-vm@v1 with: usesh: true prepare: | - pkg install -y bash autotools m4 devel/xxhash zstd liblz4 wget python3 archivers/liblz4 + pkg install -y bash autotools m4 devel/xxhash zstd liblz4 python3 archivers/liblz4 run: | freebsd-version - ./configure --with-rrsync -disable-zstd --disable-md2man --disable-xxhash --disable-lz4 + ./configure --with-rrsync --disable-md2man make ./rsync --version ./rsync-ssl --no-motd download.samba.org::rsyncftp/ || true + - name: save artifact + uses: actions/upload-artifact@v3 + with: + name: freebsd-bin + path: | + rsync + rsync-ssl + rrsync diff --git a/.github/workflows/freebsd-build.yml b/.github/workflows/solaris-build.yml similarity index 62% copy from .github/workflows/freebsd-build.yml copy to .github/workflows/solaris-build.yml index 747bc35b..feb4ad0b 100644 --- a/.github/workflows/freebsd-build.yml +++ b/.github/workflows/solaris-build.yml @@ -1,4 +1,4 @@ -name: Test rsync on FreeBSD +name: Test rsync on Solaris on: push: @@ -7,20 +7,21 @@ on: branches: [ master ] jobs: - test: + solaris-test: runs-on: ubuntu-latest - name: Test rsync on FreeBSD + name: Test rsync on Solaris steps: - uses: actions/checkout@v4 - - name: Test in FreeBSD + fetch-depth: 0 + - name: Test in Solaris id: test - uses: vmactions/freebsd-vm@v1 + uses: vmactions/solaris-vm@v1 with: usesh: true prepare: | - pkg install -y bash autotools m4 devel/xxhash zstd liblz4 wget python3 archivers/liblz4 + pkg install bash automake gnu-m4 pkg://solaris/runtime/python-35 autoconf gcc run: | - freebsd-version + uname -a ./configure --with-rrsync -disable-zstd --disable-md2man --disable-xxhash --disable-lz4 make ./rsync --version diff --git a/Makefile.in b/Makefile.in index 6bf304d1..d5fefe04 100644 --- a/Makefile.in +++ b/Makefile.in @@ -184,14 +184,6 @@ conf: configure.sh config.h.in .PHONY: gen gen: conf proto.h man git-version.h -.PHONY: gensend -gensend: gen - if ! diff git-version.h $(srcdir)/gists/rsync-git-version.h >/dev/null; then \ - ./rsync -ai git-version.h $(srcdir)/gists/rsync-git-version.h && \ - (cd $(srcdir)/gists && git commit --allow-empty-message -m '' rsync-git-version.h && git push) ; \ - fi - rsync -aic $(GENFILES) git-version.h $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/ || true - aclocal.m4: $(srcdir)/m4/*.m4 aclocal -I $(srcdir)/m4 diff --git a/README.md b/README.md index 6bedf2e1..82db2157 100644 --- a/README.md +++ b/README.md @@ -132,9 +132,6 @@ source. COPYRIGHT --------- -Rsync was originally written by Andrew Tridgell and has been improved by many -developers from around the world. - Rsync was originally written by Andrew Tridgell and Paul Mackerras. Many people from around the world have helped to maintain and improve it. diff --git a/packaging/auto-Makefile b/packaging/auto-Makefile index 7f2e2585..032913d5 100644 --- a/packaging/auto-Makefile +++ b/packaging/auto-Makefile @@ -1,4 +1,4 @@ -TARGETS := all install install-ssl-daemon install-all install-strip conf gen gensend reconfigure restatus \ +TARGETS := all install install-ssl-daemon install-all install-strip conf gen reconfigure restatus \ proto man clean cleantests distclean test check check29 check30 installcheck splint \ doxygen doxygen-upload finddead rrsync diff --git a/packaging/pkglib.py b/packaging/pkglib.py index c4c5741d..c2b29307 100644 --- a/packaging/pkglib.py +++ b/packaging/pkglib.py @@ -170,17 +170,6 @@ def get_patch_branches(base_branch): return branches -def mandate_gensend_hook(): - hook = '.git/hooks/pre-push' - if not os.path.exists(hook): - print('Creating hook file:', hook) - cmd_chk(['./rsync', '-a', 'packaging/pre-push', hook]) - else: - ct = cmd_txt(['grep', 'make gensend', hook], discard='output') - if ct.rc: - die('Please add a "make gensend" into your', hook, 'script.') - - # Snag the GENFILES values out of the Makefile file and return them as a list. def get_gen_files(want_dir_plus_list=False): cont_re = re.compile(r'\\\n') diff --git a/packaging/pre-push b/packaging/pre-push deleted file mode 100755 index 8a713695..00000000 --- a/packaging/pre-push +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -e - -cat >/dev/null # Just discard stdin data - -if [[ -f /proc/$PPID/cmdline ]]; then - while read -d $'\0' arg ; do - if [[ "$arg" == '--tags' ]] ; then - exit 0 - fi - done </proc/$PPID/cmdline -fi - -branch=`git rev-parse --abbrev-ref HEAD` -if [[ "$branch" = master && "$*" == *github* ]]; then - make gensend -fi diff --git a/packaging/release-rsync b/packaging/release-rsync index 511e90f1..03d9f6a3 100755 --- a/packaging/release-rsync +++ b/packaging/release-rsync @@ -27,8 +27,6 @@ def main(): ztoday = now.strftime('%d %b %Y') today = ztoday.lstrip('0') - mandate_gensend_hook() - curdir = os.getcwd() signal.signal(signal.SIGINT, signal_handler) diff --git a/version.h b/version.h index 47d5dbe1..c6515f68 100644 --- a/version.h +++ b/version.h @@ -1,2 +1,2 @@ -#define RSYNC_VERSION "3.3.1pre" +#define RSYNC_VERSION "3.3.1dev" #define MAINTAINER_TZ_OFFSET -7.0 -- The rsync repository. _______________________________________________ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs