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

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

[nongnu] elpa/webpaste 3c9d2e8 284/298: Merge branch 'github-actions'


From: ELPA Syncer
Subject: [nongnu] elpa/webpaste 3c9d2e8 284/298: Merge branch 'github-actions'
Date: Thu, 9 Dec 2021 19:00:30 -0500 (EST)

branch: elpa/webpaste
commit 3c9d2e840cf3fd5929caa4bfb7585f0799a8e026
Merge: 9662b1c 76d740e
Author: Elis Hirwing <elis@hirwing.se>
Commit: Elis Hirwing <elis@hirwing.se>

    Merge branch 'github-actions'
---
 .github/workflows/integration-tests.yml | 44 +++++++++++++++++++++++++++++++++
 .github/workflows/unit-tests.yml        | 44 +++++++++++++++++++++++++++++++++
 .travis.yml                             | 33 -------------------------
 Makefile                                |  4 +--
 README.org                              |  1 -
 5 files changed, 90 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/integration-tests.yml 
b/.github/workflows/integration-tests.yml
new file mode 100644
index 0000000..7bbf2d0
--- /dev/null
+++ b/.github/workflows/integration-tests.yml
@@ -0,0 +1,44 @@
+name: "Integration tests"
+
+on:
+  pull_request:
+  push:
+    paths-ignore:
+      - '**.org'
+      - '.dir-locals.el'
+    branches:
+      - master
+  # Run this job set on schedule every Saturday
+  schedule:
+    - cron: '0 12 * * 6'
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ ubuntu-latest ]
+        emacs_version: [ 27.1 ]
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: purcell/setup-emacs@master
+        with:
+          version: ${{ matrix.emacs_version }}
+
+      - name: Install cask
+        run: nix-env -f '<nixpkgs>' -iA cask
+
+      - name: Check emacs version
+        run: emacs --version
+
+      - name: Cask install
+        run: cask install
+
+      - name: Run tests
+        run: make integration
+        # Undercover currently don't recognize GitHub Actions as a CI
+        # environment. So we'll set this flag to force it.
+        env:
+          UNDERCOVER_FORCE: true
+        continue-on-error: ${{ true }}
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
new file mode 100644
index 0000000..0834a74
--- /dev/null
+++ b/.github/workflows/unit-tests.yml
@@ -0,0 +1,44 @@
+name: "Unit tests"
+
+on:
+  pull_request:
+  push:
+    paths-ignore:
+      - '**.org'
+      - '.dir-locals.el'
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ ubuntu-latest, macos-latest ]
+        emacs_version: [ 26.1, 26.2, 26.3, 27.1, snapshot ]
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: purcell/setup-emacs@master
+        with:
+          version: ${{ matrix.emacs_version }}
+
+      - name: Install cask
+        run: nix-env -f '<nixpkgs>' -iA cask
+        # Cask was marked to only be supported on Linux and not macOS in nix.
+        env:
+          NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM: 1
+
+      - name: Check emacs version
+        run: emacs --version
+
+      - name: Cask install
+        run: cask install
+
+      - name: Run tests
+        run: make test
+        # Undercover currently don't recognize GitHub Actions as a CI
+        # environment. So we'll set this flag to force it.
+        env:
+          UNDERCOVER_FORCE: true
+        continue-on-error: ${{ matrix.emacs_version == 'snapshot' }}
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 35c5520..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-language: nix
-os:
-  - linux
-
-# Allow Emacs snapshot and integration builds to fail
-matrix:
-  allow_failures:
-    - env: EMACS_CI=emacs-snapshot
-    - env: EMACS_CI=emacs-26-3 INTEGRATION=yes
-
-env:
-  - EMACS_CI=emacs-26-1
-  - EMACS_CI=emacs-26-2
-  - EMACS_CI=emacs-26-3
-  - EMACS_CI=emacs-snapshot
-  - EMACS_CI=emacs-26-3 INTEGRATION=yes
-
-install:
-  # Install nix-emacs-ci
-  - bash <(curl 
https://raw.githubusercontent.com/purcell/nix-emacs-ci/master/travis-install)
-
-  # Install cask
-  - nix-env -iA nixpkgs.cask
-
-  # Install your dependencies
-  - cask install
-
-script:
-  # Run the tests if we shouldn't trigger the integrations
-  - if test -z "$INTEGRATION"; then make test;        fi
-
-  # Otherwise we run the integration tests
-  - if test -n "$INTEGRATION"; then make integration; fi
diff --git a/Makefile b/Makefile
index 9b58845..94ecc9e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-TRAVIS ?= false
+GITHUB_ACTIONS ?= false
 EMACS ?= emacs
 CASK ?= cask
 
-ifeq ($(TRAVIS),true)
+ifeq ($(GITHUB_ACTIONS),true)
        PATTERN=--pattern '\[ci\]'
 endif
 
diff --git a/README.org b/README.org
index 64c4e10..cd179c0 100644
--- a/README.org
+++ b/README.org
@@ -1,7 +1,6 @@
 
[[https://www.gnu.org/licenses/gpl-3.0.txt][https://img.shields.io/badge/license-GPL_3-green.svg]]
 [[https://melpa.org/#/webpaste][https://melpa.org/packages/webpaste-badge.svg]]
 
[[https://stable.melpa.org/#/webpaste][https://stable.melpa.org/packages/webpaste-badge.svg]]
-[[https://travis-ci.org/etu/webpaste.el][https://travis-ci.org/etu/webpaste.el.svg?branch=master]]
 
[[https://coveralls.io/github/etu/webpaste.el?branch=master][https://coveralls.io/repos/github/etu/webpaste.el/badge.svg?branch=master]]
 
 * Webpaste.el -- Paste text to pastebin-like services



reply via email to

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