branch: elpa/loopy-dash
commit d8ca506cd8ca3c04144670ded6c43e2e7d59afbd
Author: okamsn <28612288+oka...@users.noreply.github.com>
Commit: GitHub <nore...@github.com>

    Update GitHub Action for re-organized repo for base-package. (#3)
    
    File were moved around in the Loopy repository.
---
 .github/workflows/emacs-matrix-tests.yml |  8 ++------
 tests/install-script.el                  | 11 +++++++++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/emacs-matrix-tests.yml 
b/.github/workflows/emacs-matrix-tests.yml
index fc96394f3d..202f47aec2 100644
--- a/.github/workflows/emacs-matrix-tests.yml
+++ b/.github/workflows/emacs-matrix-tests.yml
@@ -39,12 +39,8 @@ jobs:
     - name: Clone package Loopy to sub-folder
       run: |
         git clone 'https://github.com/okamsn/loopy.git' ./loopy
-        ls ./loopy
-    - name: Copy package Loopy to sub-sub-folder
-      run: |
-        mkdir --verbose ./loopy/loopy
-        cp --verbose --target-directory=./loopy/loopy ./loopy/*.el
-        ls ./loopy/loopy
+    - name: Build Tar file for base package
+      run: make --directory=./loopy tar
     - name: Install packages
       run: emacs -batch -l tests/install-script.el
     - name: Dash tests
diff --git a/tests/install-script.el b/tests/install-script.el
index c9c9ef5503..b2b2957217 100644
--- a/tests/install-script.el
+++ b/tests/install-script.el
@@ -1,8 +1,15 @@
+;; -*- lexical-binding: t; -*-
 (setq package-user-dir "~/.emacs.d/elpa")
 (message "Current directory: %s" default-directory)
 (require 'package)
 (package-refresh-contents)
-(message "\nInstall main package from directory:\n")
-(package-install-file (expand-file-name "loopy/loopy/" default-directory))
+
+(message "\nInstall Loopy from tar file:")
+(let ((tar-files (directory-files (expand-file-name "loopy/" default-directory)
+                                  t
+                                  "\\`loopy-.*?.tar\\'")))
+  (cl-assert (= 1 (length tar-files)))
+  (package-install-file (cl-first tar-files)))
+
 (message "\nInstall from file:\n")
 (package-install-file (expand-file-name "loopy-dash.el" default-directory))

Reply via email to