diff options
| -rw-r--r-- | .github/workflows/test.yml | 61 | ||||
| -rw-r--r-- | Makefile | 23 | ||||
| -rw-r--r-- | t/default.nix | 18 |
3 files changed, 35 insertions, 67 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 814bd17..a38c1b6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,42 +1,51 @@ name: test on: [ push, pull_request ] +env: + BUILD_MAGIT_LIBGIT: "false" jobs: test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: matrix: emacs_version: - 25.1 - # 25.2 is identical to 25.3 except for a critical security bug in - # enriched text mode (see Emacs Bug#28350). - 25.3 - - 26.1 # Debian is on this version. + - 26.1 + - 26.2 - 26.3 - 27.1 + - 27.2 - snapshot - git_impl: - - git - # FIXME Broken due to glibc version mismatch. See #4456. - # - libgit steps: - - uses: cachix/install-nix-action@v12 - with: - nix_path: nixpkgs=channel:nixos-unstable - - uses: cachix/cachix-action@v8 - with: - name: emacs-ci - - uses: actions/checkout@v2 - - name: Install + - name: Configure git run: | - # Build and install Emacs (+ magit dependencies) using Nix - emacs_ci_version=$(echo "emacs-${{ matrix.emacs_version }}" | sed -e "s/\./-/g") - nix-env -f ./t/default.nix -iA $emacs_ci_version - emacs --version - - # Configure Git git config --global user.name "A U Thor" git config --global user.email a.u.thor@example.com - git tag 0 - - name: Test - run: | - make test-${{ matrix.git_impl }} DASH_DIR=$PWD + - name: Install emacs + uses: purcell/setup-emacs@master + with: + version: ${{ matrix.emacs_version }} + - name: Checkout dash + uses: actions/checkout@v2 + with: + repository: magnars/dash.el + path: dash + - name: Checkout transient + uses: actions/checkout@v2 + with: + repository: magit/transient + path: transient + - name: Checkout with-editor + uses: actions/checkout@v2 + with: + repository: magit/with-editor + path: with-editor + - name: Checkout magit + uses: actions/checkout@v2 + with: + repository: magit/magit + path: magit + - name: Build magit + run: make -C magit all + - name: Test magit + run: make -C magit test @@ -50,8 +50,6 @@ help: $(info ====) $(info ) $(info make test - run tests) - $(info make test-git - run tests using Git functions) - $(info make test-libgit - run tests using libgit functions) $(info make test-interactive - run tests interactively) $(info make emacs-Q - run emacs -Q plus Magit) $(info ) @@ -113,27 +111,6 @@ test: (load-file \"t/magit-tests.el\")\ (ert-run-tests-batch-and-exit))" -test-git: - @$(BATCH) --eval "(progn\ - $$suppress_warnings\ - (require 'magit)\ - (setq magit-inhibit-libgit t)\ - (unless (eq 'git (magit-gitimpl))\ - (message \"Git implementation not being used.\")\ - (kill-emacs 1))\ - (load-file \"t/magit-tests.el\")\ - (ert-run-tests-batch-and-exit))" - -test-libgit: - @$(BATCH) --eval "(progn\ - $$suppress_warnings\ - (require 'magit)\ - (unless (eq 'libgit (magit-gitimpl))\ - (message \"libgit not available.\")\ - (kill-emacs 1))\ - (load-file \"t/magit-tests.el\")\ - (ert-run-tests-batch-and-exit))" - test-interactive: @$(EMACSBIN) -Q $(LOAD_PATH) --eval "(progn\ (load-file \"t/magit-tests.el\")\ diff --git a/t/default.nix b/t/default.nix deleted file mode 100644 index cf3b926..0000000 --- a/t/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -let - emacs-overlay = import (builtins.fetchTarball { url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz; }); - emacs-ci = import (builtins.fetchTarball { url = https://github.com/purcell/nix-emacs-ci/archive/master.tar.gz; }); - - pkgs = import <nixpkgs> { overlays = [ emacs-overlay ]; }; -in -builtins.mapAttrs - (version: emacs: - (pkgs.emacsPackagesGen emacs).emacsWithPackages - (emacsPackages: [ - emacsPackages.dash - emacsPackages.transient - ] ++ (with emacsPackages.melpaPackages; [ - libgit - with-editor - ]) - )) - emacs-ci |