chore(ci): make use of the new MINEMACS_LOAD_ALL_MODULES envvar

abougouffa · Jan 31, 2024 · 2e24998 · 2e24998
1 parent 4cbdf1e
commit 2e24998
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/ci-linux.yaml b/.github/workflows/ci-linux.yaml
@@ -48,7 +48,7 @@ jobs:
           ln -s "$(pwd)" "../.emacs.d"
           echo "Enabling all MinEmacs modules"
           echo "Running Emacs with MinEmacs configuration"
-          MINEMACSDIR=.github/workflows/scripts/minemacs-all.d/
+          MINEMACS_LOAD_ALL_MODULES=1
           make ci | tee /tmp/minemacs-output
           EMACS_EXIT_CODE=$?
           if [[ "$EMACS_EXIT_CODE" == 0 ]]; then
@@ -73,7 +73,7 @@ jobs:
       - name: Running MinEmacs in always demand mode
         run: |
           echo "Loading Emacs with MINEMACS_ALWAYS_DEMAND"
-          MINEMACSDIR=.github/workflows/scripts/minemacs-all.d/
+          MINEMACS_LOAD_ALL_MODULES=1
           MINEMACS_ALWAYS_DEMAND=1
           make ci | tee /tmp/minemacs-output
           EMACS_EXIT_CODE=$?
@@ -99,7 +99,7 @@ jobs:
       - name: Running MinEmacs in daemon mode
         run: |
           echo "Loading Emacs in daemon mode"
-          MINEMACSDIR=.github/workflows/scripts/minemacs-all.d/
+          MINEMACS_LOAD_ALL_MODULES=1
           make ci-daemon | tee /tmp/minemacs-output
           EMACS_EXIT_CODE=$?
           if [[ "$EMACS_EXIT_CODE" == 0 ]]; then

diff --git a/.github/workflows/ci-macos.yaml b/.github/workflows/ci-macos.yaml
@@ -43,7 +43,7 @@ jobs:
           ln -s "$(pwd)" "../.emacs.d"
           echo "Enabling all MinEmacs modules"
           echo "Running Emacs with MinEmacs configuration"
-          MINEMACSDIR=.github/workflows/scripts/minemacs-all.d/
+          MINEMACS_LOAD_ALL_MODULES=1
           make ci | tee /tmp/minemacs-output
           EMACS_EXIT_CODE=$?
           if [[ "$EMACS_EXIT_CODE" == 0 ]]; then
@@ -68,7 +68,7 @@ jobs:
       - name: Running MinEmacs in always demand mode
         run: |
           echo "Loading Emacs with MINEMACS_ALWAYS_DEMAND"
-          MINEMACSDIR=.github/workflows/scripts/minemacs-all.d/
+          MINEMACS_LOAD_ALL_MODULES=1
           MINEMACS_ALWAYS_DEMAND=1
           make ci | tee /tmp/minemacs-output
           EMACS_EXIT_CODE=$?
@@ -94,7 +94,7 @@ jobs:
       - name: Running MinEmacs in daemon mode
         run: |
           echo "Loading Emacs in daemon mode"
-          MINEMACSDIR=.github/workflows/scripts/minemacs-all.d/
+          MINEMACS_LOAD_ALL_MODULES=1
           make ci-daemon | tee /tmp/minemacs-output
           EMACS_EXIT_CODE=$?
           if [[ "$EMACS_EXIT_CODE" == 0 ]]; then

diff --git a/.github/workflows/ci-windows.yaml b/.github/workflows/ci-windows.yaml
@@ -27,7 +27,7 @@ jobs:
       - name: Running MinEmacs with all modules
         run: |
           $env:HOME = "D:\a\minemacs\"
-          $env:MINEMACSDIR = "D:\a\minemacs\.github\workflows\scripts\minemacs-all.d\"
+          $env:MINEMACS_LOAD_ALL_MODULES = "1"
           emacs --no-window-system --batch --script .github\workflows\scripts\ci-init.el
       - name: Running MinEmacs in always demand mode
         run: |
@@ -38,6 +38,6 @@ jobs:
       - name: Running MinEmacs in daemon mode
         run: |
           echo "Loading Emacs in daemon mode"
-          $env:MINEMACSDIR = "D:\a\minemacs\.github\workflows\scripts\minemacs-all.d\"
+          $env:MINEMACS_LOAD_ALL_MODULES = "1"
           emacs --daemon --script .github\workflows\scripts\ci-init.el
           echo "Finished"