Skip to content

Commit 2a97d81

Browse files
committed
CI: fixed MacOS test
fixed multiple MacOS issues
1 parent 359e539 commit 2a97d81

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

.github/workflows/cygwin-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: info
4040
run: bash -c '/usr/local/bin/rsync --version'
4141
- name: check
42-
run: bash -c 'RSYNC_EXPECT_SKIPPED=acls-default,acls,chown,devices,dir-sgid,protected-regular make check'
42+
run: bash -c 'RSYNC_EXPECT_SKIPPED=acls-default,acls,chown,devices,dir-sgid,open-noatime,protected-regular make check'
4343
- name: ssl file list
4444
run: bash -c 'PATH="/usr/local/bin:$PATH" rsync-ssl --no-motd download.samba.org::rsyncftp/ || true'
4545
- name: save artifact

.github/workflows/macos-build.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,27 @@ jobs:
2525
- name: prep
2626
run: |
2727
brew install automake openssl xxhash zstd lz4
28-
sudo pip3 install commonmark
29-
echo "/usr/local/bin" >>$GITHUB_PATH
28+
pip3 install --user --break-system-packages commonmark
29+
echo "$(brew --prefix)/bin" >>$GITHUB_PATH
3030
- name: configure
31-
run: CPPFLAGS=-I/usr/local/opt/openssl/include/ LDFLAGS=-L/usr/local/opt/openssl/lib/ ./configure --with-rrsync
31+
run: |
32+
BREW_PREFIX=$(brew --prefix)
33+
OPENSSL_PREFIX=$(brew --prefix openssl)
34+
CPPFLAGS="-I${BREW_PREFIX}/include -I${OPENSSL_PREFIX}/include" \
35+
LDFLAGS="-L${BREW_PREFIX}/lib -L${OPENSSL_PREFIX}/lib" \
36+
./configure --with-rrsync
3237
- name: make
3338
run: make
3439
- name: install
3540
run: sudo make install
3641
- name: info
3742
run: rsync --version
3843
- name: check
39-
run: sudo RSYNC_EXPECT_SKIPPED=acls-default,chmod-temp-dir,chown-fake,devices-fake,dir-sgid,protected-regular,xattrs-hlink,xattrs make check
44+
run: sudo RSYNC_EXPECT_SKIPPED=acls-default,chmod-temp-dir,chown-fake,devices-fake,dir-sgid,open-noatime,protected-regular,xattrs-hlink,xattrs make check
4045
- name: ssl file list
4146
run: rsync-ssl --no-motd download.samba.org::rsyncftp/ || true
4247
- name: save artifact
43-
uses: actions/upload-artifact@v3
48+
uses: actions/upload-artifact@v4
4449
with:
4550
name: macos-bin
4651
path: |

testsuite/open-noatime.test

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66

77
$RSYNC -VV | grep '"atimes": true' >/dev/null || test_skipped "Rsync is configured without atimes support"
88

9+
# O_NOATIME is Linux-specific; skip on other platforms
10+
case `uname` in
11+
Linux) ;;
12+
*) test_skipped "O_NOATIME is only supported on Linux" ;;
13+
esac
14+
915
mkdir "$fromdir"
1016

1117
# --open-noatime did not work properly on files with size > 0

0 commit comments

Comments
 (0)