build: fixup CI scripts

sdm-lang · Jun 24, 2024 · 23d19ab · 23d19ab
1 parent b57eb1c
commit 23d19ab
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 24 deletions.
diff --git a/.github/workflows/melpazoid.yml b/.github/workflows/melpazoid.yml
@@ -4,21 +4,21 @@ on: [push, pull_request]
 
 jobs:
   melpazoid:
+    runs-on: ubuntu-latest
+
     strategy:
       matrix:
-        package:
-          - flycheck-sdml
-          - ob-sdml
-          - sdml-fold
-          - sdml-ispell
-          - sdml-modesdml-model
-
-    runs-on: ubuntu-latest
-
+        emacs_version: ['28.1', '28.2', '29.1']
+
     steps:
     - name: Checkout
       uses: actions/checkout@v4
-
+
+    - name: Set up Emacs
+      uses: jcs090218/setup-emacs@master
+      with:
+        version: ${{matrix.emacs_version}}
+
     - name: Set up Python 3.9
       uses: actions/setup-python@v4
       with:
@@ -27,14 +27,13 @@ jobs:
     - name: Install Melpazoid
       run: |
         python -m pip install --upgrade pip
-        sudo apt-get install emacs && emacs --version
         git clone https://github.com/riscy/melpazoid.git ~/melpazoid
         pip install ~/melpazoid
 
     - Name: Check Package ${{matrix/package}}
       env:
         LOCAL_REPO: ${{ github.workspace }}
-        RECIPE: (${{matrix/package}} :fetcher github :repo "johnstonskj/emacs-sdml-mode" :files ("${{matrix/package}}/${{matrix/package}}.el"))
+        RECIPE: (sdml-mode :fetcher github :repo "sdm-lang/emacs-sdml-mode" :files ("sdml-mode.el"))
         # set this to false (or remove it) if the package isn't on MELPA:
         EXIST_OK: false
       run: |

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,12 +15,6 @@ jobs:
 
     strategy:
       matrix:
-        package:
-          - flycheck-sdml
-          - ob-sdml
-          - sdml-fold
-          - sdml-ispell
-          - sdml-modesdml-model
         os: [ubuntu-latest]
         emacs_version: ['24.4', '24.5',
                         '25.1', '25.2', '25.3',
@@ -46,22 +40,16 @@ jobs:
 
     - name: Check out the source code
       uses: actions/checkout@v4
-      with:
-        # To make automated copyright notice check below work.  Can this be optimized?
-        fetch-depth: 0
 
     - name: Lint the project
       run: |
-        cd ${{matrix.package}}
         eldev $ELDEV_ARGS lint
 
     - name: Test the project
       run: |
-        cd ${{matrix.package}}
         eldev $ELDEV_ARGS -p --expect 10
         eldev $ELDEV_ARGS compile --warnings-as-errors
 
     - name: Ensure that copyright notices are up-to-date
       run: |
-        cd ${{matrix.package}}
         eldev $ELDEV_ARGS -p doctor up-to-date-copyright --all-tests