From 8aa3224b2e13eb00fef44aa030b25afdf922dcbc Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Mon, 25 Mar 2024 01:56:21 +0900
Subject: [PATCH] Use Eask

---
 .emacs.d/.gitignore      |  1 +
 .emacs.d/el-get/.gitkeep |  1 +
 .github/workflows/ci.yml | 68 +++++++++-------------------------------
 Eask                     | 14 +++++++++
 4 files changed, 31 insertions(+), 53 deletions(-)
 create mode 100644 .emacs.d/el-get/.gitkeep
 create mode 100644 Eask

diff --git a/.emacs.d/.gitignore b/.emacs.d/.gitignore
index ced3687..fc292c5 100644
--- a/.emacs.d/.gitignore
+++ b/.emacs.d/.gitignore
@@ -9,6 +9,7 @@ url
 tramp
 .edbi-ds-history
 el-get/*
+!el-get/.gitkeep
 .session
 elpa
 tutorial
diff --git a/.emacs.d/el-get/.gitkeep b/.emacs.d/el-get/.gitkeep
new file mode 100644
index 0000000..dd626a0
--- /dev/null
+++ b/.emacs.d/el-get/.gitkeep
@@ -0,0 +1 @@
+()
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 52fb6ff..7ab57a1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,64 +14,26 @@ on:
       - '!*.md'
 
 jobs:
-  run-on-mac:
-    name: Run on Mac
+  build:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-latest ]
+        os: [ubuntu-latest, macos-latest]
+        emacs-version:
+          - "29.2"
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-    - name: Checkout Emacs
-      uses: actions/checkout@v4
+    - uses: actions/checkout@v4
+    - uses: purcell/setup-emacs@master
       with:
-        repository: nanasess/emacs-package
-        ref: for-carbon-emacs
-        path: ./emacs-package
-        submodules: true
-    - name: prepare
-      run: |
-        git config --global user.name "Kentaro Ohkouchi"
-        git config --global user.email nanasess@example.com
-        brew install texinfo pkg-config
-        cd ./emacs-package/emacs && ./autogen.sh
-
-    - name: build emacs
-      working-directory: ./emacs-package
-      run: |
-        sudo mkdir -p /usr/local/libexec
-        sudo chown -R runner /usr/local/libexec
-        export PATH="/usr/local/opt/texinfo/bin:$PATH"
-        export PATH="/usr/local/opt/gnutls/bin:$PATH"
-        make install
-
-    - run: emacs-package/emacs/mac/Emacs.app/Contents/MacOS/Emacs --version
-    - name: bootstrap
-      run: emacs-package/emacs/mac/Emacs.app/Contents/MacOS/Emacs -q -l .emacs.d/init.el --batch
-    - name: byte-compile
-      run: emacs-package/emacs/mac/Emacs.app/Contents/MacOS/Emacs -q -l .emacs.d/init.el --batch -f batch-byte-compile .emacs.d/init.el
-  run-on-ubuntu:
-    name: Run on Ubuntu
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ ubuntu-latest ]
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-    - name: build emacs
+        version: ${{ matrix.emacs-version }}
+    - uses: emacs-eask/setup-eask@master
+      with:
+        version: 'snapshot'
+    - run: mv .emacs.d/el-get/.gitkeep .emacs.d/el-get/.status.el
+    - run: emacs -Q -l .emacs.d/early-init.el -l .emacs.d/init.el  --batch
+    - name: Eask
       run: |
-         sudo add-apt-repository ppa:kelleyk/emacs
-         sudo apt-fast update
-         sudo apt-fast install -y texinfo emacs28
+        eask clean all
+        eask compile
 
-    - run: emacs --version
-    - name: bootstrap
-      run: |
-        emacs -q -l .emacs.d/init.el --batch
-    - name: byte-compile
-      run: |
-        emacs -q -l .emacs.d/init.el --batch -f batch-byte-compile .emacs.d/init.el
diff --git a/Eask b/Eask
new file mode 100644
index 0000000..cfcc7fc
--- /dev/null
+++ b/Eask
@@ -0,0 +1,14 @@
+(package "nanasess/dotfiles"
+         "0.0.1"
+         "")
+
+(website-url "")
+(keywords "")
+
+(package-file ".emacs.d/init.el")
+
+(script "test" "echo \"Error: no test specified\" && exit 1")
+
+(source "gnu")
+
+(depends-on "emacs" "29.2")