branch: elpa/cider
commit b6341e70d0538e4550307fd52eed205496b8a907
Author: Bozhidar Batsov <[email protected]>
Commit: Bozhidar Batsov <[email protected]>
Clean up CI configuration
- Pin setup-emacs to v3 tag instead of tracking master branch
- Set fail-fast: false to prevent cascading job cancellations
- Add concurrency group to cancel superseded workflow runs
- Remove stale Emacs 27.2 DST Root CA X3 certificate workaround
from both GH Actions and CircleCI Windows steps
- Replace heavyweight circleci/clojure Docker image with cimg/base
for shellcheck job (doesn't need Clojure/Java)
- Remove commented-out Emacs 27 and snapshot job configurations
---
.circleci/config.yml | 34 +---------------------------------
.github/workflows/test.yml | 17 ++++++++---------
2 files changed, 9 insertions(+), 42 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index ab77bb38126..03b866148b6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -33,11 +33,6 @@ commands:
- run:
name: Install Eldev
command: |
- # Remove expired DST Root CA X3 certificate. Workaround
- # for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=51038
- # bug on Emacs 27.2.
- gci
cert:\LocalMachine\Root\DAC9024F54D8F6DF94935FB1732638CA6AD77C13
- gci
cert:\LocalMachine\Root\DAC9024F54D8F6DF94935FB1732638CA6AD77C13 | Remove-Item
(iwr
https://raw.github.com/doublep/eldev/master/webinstall/circle-eldev.ps1).Content
| powershell -command -
test:
steps:
@@ -54,16 +49,6 @@ commands:
command: eldev -dtT compile --warnings-as-errors
jobs:
- # NB: commented until https://github.com/magit/transient/issues/368 or
- # whatever is causing it is fixed.
- # test-ubuntu-emacs-27:
- # docker:
- # - image: silex/emacs:27-ci
- # entrypoint: bash
- # steps:
- # - setup
- # - test
-
test-ubuntu-emacs-28:
docker:
- image: silex/emacs:28-ci
@@ -88,14 +73,6 @@ jobs:
- setup
- test
- test-ubuntu-emacs-master:
- docker:
- - image: silex/emacs:master-ci
- entrypoint: bash
- steps:
- - setup
- - test
-
test-macos-emacs-latest:
macos:
xcode: "16.4.0"
@@ -115,7 +92,7 @@ jobs:
test-shellcheck:
docker:
- - image: circleci/clojure:openjdk-17-lein-2.9.5-buster
+ - image: cimg/base:current
steps:
- checkout
- shellcheck/install
@@ -134,10 +111,6 @@ workflows:
jobs:
- test-shellcheck
- test-lint
- # - test-ubuntu-emacs-27:
- # requires:
- # - test-lint
- # - test-shellcheck
- test-ubuntu-emacs-28:
requires:
- test-lint
@@ -150,11 +123,6 @@ workflows:
requires:
- test-lint
- test-shellcheck
- # TODO: reenable once this issue is fixed
https://app.circleci.com/pipelines/github/clojure-emacs/cider/2931/workflows/b7284759-c6d1-44dd-bbfc-e71709e3f62f/jobs/17699
- # - test-ubuntu-emacs-master:
- # requires:
- # - test-lint
- # - test-shellcheck
- test-windows-emacs-latest:
requires:
- test-lint
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 823f0d165f4..a87b19f625f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,17 +14,22 @@ on:
permissions:
contents: read # to fetch code (actions/checkout)
+# Cancel superseded workflow runs on the same PR.
+concurrency:
+ group: ${{ github.workflow }}-${{ github.head_ref || github.sha }}
+ cancel-in-progress: true
+
jobs:
integration:
# Run integration tests for all OSs and EMACS_VERSIONs.
runs-on: ${{matrix.os}}
strategy:
+ # Don't cancel other matrix jobs when one fails.
+ fail-fast: false
matrix:
# Test all Emacs versions on Ubuntu.
os: [ubuntu-latest]
- # TODO: reenable snapshot once this is fixed
https://app.circleci.com/pipelines/github/clojure-emacs/cider/2931/workflows/b7284759-c6d1-44dd-bbfc-e71709e3f62f/jobs/17699
- # emacs_version: ['28.2', '29.3', '30.1', 'snapshot']
emacs_version: ['28.2', '29.3', '30.1']
java_version: ['21']
include:
@@ -41,7 +46,7 @@ jobs:
steps:
- name: Set up Emacs
- uses: jcs090218/setup-emacs@master
+ uses: jcs090218/setup-emacs@v3
with:
version: ${{matrix.emacs_version}}
@@ -67,12 +72,6 @@ jobs:
- name: Install Eldev on MS-Windows
if: startsWith (matrix.os, 'windows')
run: |
- # Remove expired DST Root CA X3 certificate. Workaround
- # for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=51038
- # bug on Emacs 27.2.
- gci cert:\LocalMachine\Root\DAC9024F54D8F6DF94935FB1732638CA6AD77C13
- gci cert:\LocalMachine\Root\DAC9024F54D8F6DF94935FB1732638CA6AD77C13 |
Remove-Item
-
curl.exe -fsSL
https://raw.github.com/doublep/eldev/master/webinstall/github-eldev.bat | cmd /Q
- name: Install deps.clj on MS-Windows
