Skip to content

Commit

Permalink
bump macos version used for CI
Browse files Browse the repository at this point in the history
also configure yamllint
  • Loading branch information
cooljeanius committed Nov 20, 2024
1 parent 08b9558 commit 8fcd2cf
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 5 deletions.
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
11 changes: 7 additions & 4 deletions test/infra/gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
# Copyright (C) 2017-2024 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
Expand Down Expand Up @@ -29,8 +30,10 @@

# Rules: always run tags and branches named master*, emacs*, feature*, fix*
# Test that it triggers by pushing a tag: `git tag mytag; git push origin mytag`
# Test that it triggers by pushing to: feature/emba, feature1, master, master-2, fix/emba, emacs-299, fix-2
# Test that it doesn't trigger by pushing to: scratch-2, scratch/emba, oldbranch, dev
# Test that it triggers by pushing to: feature/emba, feature1, master, master-2,
# fix/emba, emacs-299, fix-2
# Test that it doesn't trigger by pushing to: scratch-2, scratch/emba,
# oldbranch, dev
workflow:
rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
Expand All @@ -47,7 +50,8 @@ variables:
EMACS_TEST_JUNIT_REPORT: junit-test-report.xml
EMACS_TEST_TIMEOUT: 3600
EMACS_TEST_VERBOSE: 1
# Use TLS https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled
# Use TLS:
# https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled
# DOCKER_HOST: tcp://docker:2376
# DOCKER_TLS_CERTDIR: "/certs"
# Put the configuration for each run in a separate directory to
Expand Down Expand Up @@ -153,7 +157,6 @@ default:
.filenotify-gio-template:
rules:
- if: '$CI_PIPELINE_SOURCE == "web"'
# - if: '$CI_PIPELINE_SOURCE == "schedule"'
changes:
- "**.in"
- lisp/autorevert.el
Expand Down

0 comments on commit 8fcd2cf

Please sign in to comment.