emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/popup ec3d3169a4 6/6: Merge pull request #132 from auto-co


From: ELPA Syncer
Subject: [nongnu] elpa/popup ec3d3169a4 6/6: Merge pull request #132 from auto-complete/ci
Date: Fri, 31 Dec 2021 13:58:23 -0500 (EST)

branch: elpa/popup
commit ec3d3169a4d60b0374198580e31b6c59f51ab08a
Merge: 806ec93241 6b1547b6ee
Author: Jen-Chieh Shen <jcs090218@gmail.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #132 from auto-complete/ci
    
    Replace CI from TRAVIS to GitHub Actions
---
 .github/workflows/test.yml | 44 ++++++++++++++++++++++++++++++++++++++++++++
 .travis.yml                | 20 --------------------
 Makefile                   | 36 +++++++++++++++++++-----------------
 README.md                  |  2 +-
 4 files changed, 64 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000000..cfe1cecd8d
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,44 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+    unix-test:
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                emacs-version:
+                    - 27.2
+                    - snapshot
+
+        steps:
+            - uses: actions/checkout@v2
+
+            - uses: actions/setup-python@v2
+              with:
+                  python-version: "3.6"
+                  architecture: "x64"
+
+            - uses: purcell/setup-emacs@master
+              with:
+                  version: ${{ matrix.emacs-version }}
+
+            - uses: cask/setup-cask@master
+              with:
+                  version: 0.8.4
+
+            - name: Setup cmake
+              uses: jwlawson/actions-setup-cmake@v1.4
+              with:
+                 cmake-version: '3.18.x'
+
+            - name: Check cmake
+              run: "cmake --version"
+
+            - name: Run tests
+              run:
+                make unix-ci
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 73942e1d51..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-language: generic
-sudo: false
-before_install:
-  - curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > x.sh 
&& source ./x.sh
-  - evm install $EVM_EMACS --use --skip
-  - cask
-env:
-  - EVM_EMACS=emacs-24.3-travis
-  - EVM_EMACS=emacs-24.4-travis
-  - EVM_EMACS=emacs-24.5-travis
-  - EVM_EMACS=emacs-25.1-travis
-  - EVM_EMACS=emacs-25.2-travis
-  - EVM_EMACS=emacs-25.3-travis
-  - EVM_EMACS=emacs-26.1-travis-linux-xenial
-  - EVM_EMACS=emacs-26.2-travis-linux-xenial
-  - EVM_EMACS=emacs-26.3-travis-linux-xenial
-  - EVM_EMACS=emacs-git-snapshot-travis-linux-xenial
-script:
-  - emacs --version
-  - make travis-ci
diff --git a/Makefile b/Makefile
index d26c0efa9a..435f29d4c1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,29 @@
+SHELL := /usr/bin/env bash
+
 EMACS ?= emacs
 CASK ?= cask
-EMACS23=emacs23
 
-ELPA_DIR = $(shell EMACS=$(EMACS) $(CASK) package-directory)
+PKG-FILES := popup.el
 
-.PHONY: test test-nw test-emacs23 test-emacs23-nw travis-ci
+TEST-FILES := $(shell ls test/popup-*.el)
 
-test:
-       $(CASK) exec $(EMACS) -Q -L . -l tests/run-test.el
+.PHONY: clean checkdoc lint unix-build unix-compile    unix-test
 
-test-nw:
-       $(CASK) exec $(EMACS) -Q -nw -L . -l tests/run-test.el
+unix-ci: clean unix-build unix-compile
 
-test-emacs23: tests/ert.el
-       ${EMACS23} -Q -L . -l test/ert.el -l tests/run-test.el
+unix-build:
+       $(CASK) install
 
-test-emacs23-nw: tests/ert.el
-       $(EMACS23) -Q -nw -L . -l test/ert.el -l tests/run-test.el
+unix-compile:
+       @echo "Compiling..."
+       @$(CASK) $(EMACS) -Q --batch \
+               -L . \
+               --eval '(setq byte-compile-error-on-warn t)' \
+               -f batch-byte-compile $(PKG-FILES)
 
-travis-ci: elpa
-       $(CASK) exec $(EMACS) -batch -Q -l tests/run-test.el
+unix-test:
+       @echo "Testing..."
+       $(CASK) exec ert-runner -L . $(LOAD-TEST-FILES) -t '!no-win' -t '!org'
 
-elpa: $(ELPA_DIR)
-$(ELPA_DIR): Cask
-       $(CASK) install
-       touch $@
+clean:
+       rm -rf .cask *.elc
diff --git a/README.md b/README.md
index 672e1c3ab5..2422fff6f3 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 
 # popup.el
 
-[![Build 
Status](https://secure.travis-ci.org/auto-complete/popup-el.svg)](http://travis-ci.org/auto-complete/popup-el)
 
+[![CI](https://github.com/auto-complete/popup-el/actions/workflows/test.yml/badge.svg)](https://github.com/auto-complete/popup-el/actions/workflows/test.yml)
 
 ## Overview
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]