From a26992910a0ea5c09a5577c57f2316b845874c7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Benn=C3=A9e?= <alex.bennee@linaro.org>
Date: Fri, 14 Jul 2023 15:04:39 +0100
Subject: [PATCH] release: prepare for 0.7

 - update the testing matrix for all supported Emacs (- 25.1)
 - skip build step to keep undercover happy
 - only load coveralls after 26.1
 - use cask action instead of hand hacking
 - upload coverage data
 - remove Travis badge, replace with Coveralls one
 - update News with new features
---
 .github/workflows/test.yml | 38 +++++++++++++++++++++-----------------
 NEWS                       |  2 ++
 README.org                 |  2 +-
 dired-rsync-ert.el         |  4 +++-
 4 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7af7d5e..17f009c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,11 +5,14 @@ on:
   push:
 
 jobs:
-  build:
+  test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         emacs_version:
+          # we don't include 25.1 in the matrix due to an ert testing issue
+          - 26.1
+          - 26.3
           - 27.1
           - 27.2
           - 28.1
@@ -21,23 +24,24 @@ jobs:
         with:
           version: ${{ matrix.emacs_version }}
 
-      - name: Install Cask
-        run: git clone https://github.com/cask/cask ~/.cask
-
-      - name: Add Cask to Path
-        run: echo "$HOME/.cask/bin" >> $GITHUB_PATH
-
-      - name: Validate Cask
-        run: cask emacs --version
+      - name: Setup Cask
+        uses: conao3/setup-cask@master
 
       - name: Checkout Code
         uses: actions/checkout@v3
 
-      - name: Install Elisp Deps
-        run: cask install
-        
-      - name: Build
-        run: cask build
-
-      - name: Run ERT tests
-        run: cask exec ert-runner dired-rsync-ert.el
+      - name: Test
+        env:
+          COVERALLS_FLAG_NAME: Emacs ${{ matrix.emacs_version }}
+          COVERALLS_PARALLEL: 1
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          cask install
+          cask exec ert-runner dired-rsync-ert.el
+
+  finalize:
+      runs-on: ubuntu-latest
+      if: always()
+      needs: test
+      steps:
+        - run: curl "https://coveralls.io/webhook?repo_name=$GITHUB_REPOSITORY&repo_token=${{ secrets.GITHUB_TOKEN }}" -d "payload[build_num]=$GITHUB_RUN_NUMBER&payload[status]=done"
diff --git a/NEWS b/NEWS
index 9948cb3..b04c1ce 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ v0.7
    - new dired-rsync-transient frontend
    - various code clean-ups
    - new customisation hook dired-rsync-success-hook
+   - moved the project CI to GitHub Actions
+   - now understands alternate port syntax in tramp URIs
 v0.6
    - use tramp functions to decompose URIs (fix #22)
    - use username from dired URI if we have it in rsync
diff --git a/README.org b/README.org
index 3d2674f..ce04252 100644
--- a/README.org
+++ b/README.org
@@ -2,7 +2,7 @@
 
 [[https://stable.melpa.org/#/dired-rsync][file:https://stable.melpa.org/packages/dired-rsync-badge.svg]]
 [[https://melpa.org/#/dired-rsync][file:https://melpa.org/packages/dired-rsync-badge.svg]]
-[[https://travis-ci.org/stsquad/dired-rsync][file:https://travis-ci.org/stsquad/dired-rsync.svg?branch=master]]
+[[https://coveralls.io/repos/github/stsquad/dired-rsync][file:https://coveralls.io/repos/github/stsquad/dired-rsync/badge.svg?branch=master]]
 
 * Introduction
 
diff --git a/dired-rsync-ert.el b/dired-rsync-ert.el
index 06fed5c..81b1559 100644
--- a/dired-rsync-ert.el
+++ b/dired-rsync-ert.el
@@ -9,7 +9,9 @@
 
 (require 'ert)
 
-(when (require 'undercover nil t)
+;;
+(when (and (version<= "26.1" emacs-version)
+           (require 'undercover nil t))
   (undercover "dired-rsync.el"))
 
 (require 'dired-rsync)