Fix macOS 10.15 date test (#299)
- In macOS 10.15, the `date` command adds a "-R" flag. This can be seen in the default error display. Since the flags have changed, the grep command to find which version of macOS date binary we have. Because of this change, we need to do our own check for macOS 10.15. - Remove windows from the github actions as this tool is not for Windows, currently.
This commit is contained in:
2
.github/workflows/tests.yml
vendored
2
.github/workflows/tests.yml
vendored
@@ -10,7 +10,7 @@ jobs:
|
||||
test:
|
||||
strategy:
|
||||
matrix:
|
||||
platform: [ubuntu-latest, macos-latest, windows-latest]
|
||||
platform: [ubuntu-latest, macos-latest]
|
||||
runs-on: ${{ matrix.platform }}
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
4
Makefile
4
Makefile
@@ -37,9 +37,9 @@ dist: $(DISTFILES) todo.sh
|
||||
cp -f $(DISTFILES) $(DISTNAME)/
|
||||
sed -e 's/@DEV_VERSION@/'$(VERSION)'/' todo.sh > $(DISTNAME)/todo.sh
|
||||
chmod +x $(DISTNAME)/todo.sh
|
||||
tar cf $(DISTNAME).tar $(DISTNAME)/
|
||||
tar cf $(DISTNAME).tar $(DISTNAME)
|
||||
gzip -f -9 $(DISTNAME).tar
|
||||
zip -9r $(DISTNAME).zip $(DISTNAME)/
|
||||
tar cf $(DISTNAME).zip $(DISTNAME)
|
||||
rm -r $(DISTNAME)
|
||||
|
||||
.PHONY: clean
|
||||
|
||||
@@ -495,6 +495,13 @@ test_init_todo () {
|
||||
#...
|
||||
if date --version 2>&1 | grep -q "GNU"; then
|
||||
DATE_STYLE=GNU
|
||||
# on Mac OS X 10.15:
|
||||
#date --version
|
||||
#date: illegal option -- -
|
||||
#usage: date [-jnRu] [-d dst] [-r seconds] [-t west] [-v[+|-]val[ymwdHMS]] ...
|
||||
# [-f fmt date | [[[mm]dd]HH]MM[[cc]yy][.ss]] [+format]
|
||||
elif date --version 2>&1 | grep -q -e "-jnRu"; then
|
||||
DATE_STYLE=Mac10.15
|
||||
# on Mac OS X 10.5:
|
||||
#date --version
|
||||
#date: illegal option -- -
|
||||
@@ -519,6 +526,13 @@ test_init_todo () {
|
||||
EOF
|
||||
chmod 755 bin/date
|
||||
;;
|
||||
Mac10.15)
|
||||
cat > bin/date <<-EOF
|
||||
#!/bin/sh
|
||||
exec "$TODO_TEST_REAL_DATE" -j -f %s \$TODO_TEST_TIME \$@
|
||||
EOF
|
||||
chmod 755 bin/date
|
||||
;;
|
||||
Mac10.5)
|
||||
cat > bin/date <<-EOF
|
||||
#!/bin/sh
|
||||
|
||||
Reference in New Issue
Block a user