Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump macos version used for CI from 12 to 13 #28

Merged
merged 3 commits into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/emacs-apple.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
pull_request:
jobs:
test:
runs-on: macos-12
runs-on: macos-13
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down
23 changes: 23 additions & 0 deletions .yamllint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
# https://yamllint.readthedocs.io/en/stable/configuration.html
extends: default

ignore:
- test/infra/test-jobs.yml

rules:
float-values: enable
indentation:
ignore:
- .github/workflows/*.yml
# some lines might be really long in this repo, and I don't feel like
# figuring out how to break them up:
line-length:
max: 320
level: warning
ignore:
- .gitlab-ci.yml
- .travis.yml
- test/infra/gitlab-ci.yml
octal-values: enable
truthy: disable
17 changes: 12 additions & 5 deletions autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,16 @@ fi
automake_min="`sed -n 's/^ *AM_INIT_AUTOMAKE(\([0-9\.]*\)).*/\1/p' configure.ac`"
if test "x${automake_min}" = "x"; then
test -z "${automake_min}"
echo "warning: failed to extract required automake version from configure.ac" >&2
automake_min="1.11.6"
echo "falling back to default set in $0 for automake (i.e. '${automake_min}')"
echo "warning: failed to extract required automake version from configure.ac; making a secont attempt at it..." >&2
automake_min="`sed -n 's/^ *AM_INIT_AUTOMAKE(\[\([0-9\.]*\)]).*/\1/p' configure.ac`"
if test "x${automake_min}" = "x"; then
test -z "${automake_min}"
echo "warning: still failing to extract required automake version from configure.ac" >&2
automake_min="1.11.6"
echo "falling back to default set in $0 for automake (i.e. '${automake_min}')"
else
echo "now using '${automake_min}' for minimum required automake version"
fi
fi

## prevent perl version from polluting automake version:
Expand Down Expand Up @@ -336,7 +343,7 @@ echo "timestamp: `date`" > src/stamp-h.in || echo timestamp > src/stamp-h.in ||
## Configure Git, if using Git.
if test -d .git && (git status -s) >/dev/null 2>&1; then

# Check hashes when transferring objects among repositories.
# Check hashes when transferring objects among repositories.

git config transfer.fsckObjects true || exit

Expand Down Expand Up @@ -402,7 +409,7 @@ if test -d .git && (git status -s) >/dev/null 2>&1; then
echo "skipping git hooks"
fi
else
echo "skipping git stuff"
echo "skipping git stuff"
fi

echo ""
Expand Down
Loading
Loading