diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 66bad21..b6232ee 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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 diff --git a/Makefile b/Makefile index 828a90d..1386819 100644 --- a/Makefile +++ b/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 diff --git a/tests/test-lib.sh b/tests/test-lib.sh index 79d58f8..d5a7ac8 100644 --- a/tests/test-lib.sh +++ b/tests/test-lib.sh @@ -495,11 +495,18 @@ 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 -- - #usage: date [-jnu] [-d dst] [-r seconds] [-t west] [-v[+|-]val[ymwdHMS]] ... - #[-f fmt date | [[[mm]dd]HH]MM[[cc]yy][.ss]] [+format] + # [-f fmt date | [[[mm]dd]HH]MM[[cc]yy][.ss]] [+format] elif date --version 2>&1 | grep -q -e "-jnu"; then DATE_STYLE=Mac10.5 # on Mac OS X 10.4: @@ -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