From 03b802aaf48090a93cb93a6dc7caca8e326da417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Kryger?= <pkryger@gmail.com>
Date: Wed, 20 Nov 2024 15:37:38 +0100
Subject: [PATCH] [fu] ci - flycheck - try home checkout

---
 .ci/batch-byte-compile.sh   |  2 +-
 .ci/batch-checkdoc.sh       |  2 +-
 .ci/batch-flycheck.sh       |  2 +-
 .ci/first-start.sh          |  2 +-
 .ci/unit-test-cl.sh         |  2 +-
 .ci/unit-tests.sh           |  2 +-
 .github/workflows/tests.yml | 12 ++++++------
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.ci/batch-byte-compile.sh b/.ci/batch-byte-compile.sh
index 8d268db2..8ef8eb80 100755
--- a/.ci/batch-byte-compile.sh
+++ b/.ci/batch-byte-compile.sh
@@ -3,7 +3,7 @@
 set -x
 set -e
 
-EMACS_DIR="$(cd "${GITHUB_WORKSPACE:-${HOME}}/${1:-.emacs.d}" && pwd -P)"
+EMACS_DIR="$(cd "${HOME}/${1:-.emacs.d}" && pwd -P)"
 EMACS=${EMACS:=emacs}
 
 exit_code=0
diff --git a/.ci/batch-checkdoc.sh b/.ci/batch-checkdoc.sh
index 9356b6f4..08ef8f50 100755
--- a/.ci/batch-checkdoc.sh
+++ b/.ci/batch-checkdoc.sh
@@ -3,7 +3,7 @@
 set -x
 set -e
 
-EMACS_DIR="$(cd "${GITHUB_WORKSPACE:-${HOME}}/${1:-.emacs.d}" && pwd -P)"
+EMACS_DIR="$(cd "${HOME}/${1:-.emacs.d}" && pwd -P)"
 EMACS=${EMACS:=emacs}
 
 for pattern in "modules/*.el" "init.el" "themes/*.el" ".ci/*.el"; do
diff --git a/.ci/batch-flycheck.sh b/.ci/batch-flycheck.sh
index 966f5268..f2414ff2 100755
--- a/.ci/batch-flycheck.sh
+++ b/.ci/batch-flycheck.sh
@@ -3,7 +3,7 @@
 set -x
 set -e
 
-EMACS_DIR="$(cd "${GITHUB_WORKSPACE:-${HOME}}/${1:-.emacs.d}" && pwd -P)"
+EMACS_DIR="$(cd "${HOME}/${1:-.emacs.d}" && pwd -P)"
 EMACS=${EMACS:=emacs}
 
 for pattern in "modules/*.el" "init.el" "themes/*.el" ".ci/*.el"; do
diff --git a/.ci/first-start.sh b/.ci/first-start.sh
index 8669cebd..9eaefe47 100755
--- a/.ci/first-start.sh
+++ b/.ci/first-start.sh
@@ -3,7 +3,7 @@
 set -x
 set -e
 
-EMACS_DIR="$(cd "${GITHUB_WORKSPACE:-${HOME}}/${1:-.emacs.d}" && pwd -P)"
+EMACS_DIR="$(cd "${HOME}/${1:-.emacs.d}" && pwd -P)"
 EMACS=${EMACS:=emacs}
 
 # Redefine ask-user-about-lock as the melpa seems to stumble on it
diff --git a/.ci/unit-test-cl.sh b/.ci/unit-test-cl.sh
index e3cfb5ed..b8496824 100755
--- a/.ci/unit-test-cl.sh
+++ b/.ci/unit-test-cl.sh
@@ -2,7 +2,7 @@
 
 set -x
 set -e
-EMACS_DIR="$(cd "${GITHUB_WORKSPACE:-${HOME}}/${1:-.emacs.d}" && pwd -P)"
+EMACS_DIR="$(cd "${HOME}/${1:-.emacs.d}" && pwd -P)"
 EMACS=${EMACS:=emacs}
 
 ${EMACS} -Q --batch \
diff --git a/.ci/unit-tests.sh b/.ci/unit-tests.sh
index 4834ea87..9b8a01b7 100755
--- a/.ci/unit-tests.sh
+++ b/.ci/unit-tests.sh
@@ -3,7 +3,7 @@
 set -x
 set -e
 
-EMACS_DIR="$(cd "${GITHUB_WORKSPACE:-${HOME}}/${1:-.emacs.d}" && pwd -P)"
+EMACS_DIR="$(cd "${HOME}/${1:-.emacs.d}" && pwd -P)"
 EMACS=${EMACS:=emacs}
 
 # Run all tests form *.t.el
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d9d52816..73fb7166 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -38,7 +38,12 @@ jobs:
 
       - uses: actions/checkout@v4
         with:
-          path: '.emacs.d'
+          path: "${HOME}/.emacs.d"
+
+      # - name: Link .emacs.d to $HOME # batch-flycheck expects Exordium
+      #                                # to be installed in ${HOME}/.emacs.d
+      #   if: contains(fromJSON('["29.4", "snapshot"]'), matrix.emacs_version)
+      #   run: ln -s "${GITHUB_WORKSPACE}/.emacs.d" "${HOME}/.emacs.d"
 
       - name: Install bash # Needed for mapfile on macOS,
                            # Installing early so all scripts run in
@@ -70,11 +75,6 @@ jobs:
         if: contains(fromJSON('["29.4", "snapshot"]'), matrix.emacs_version)
         run: .emacs.d/.ci/batch-byte-compile.sh
 
-      - name: Link .emacs.d to $HOME # batch-flycheck expects Exordium
-                                     # to be installed in ${HOME}/.emacs.d
-        if: contains(fromJSON('["29.4", "snapshot"]'), matrix.emacs_version)
-        run: ln -s "${GITHUB_WORKSPACE}/.emacs.d" "${HOME}/.emacs.d"
-
       - name: 'Lint: flycheck' # After compilation that should install all packages
         if: contains(fromJSON('["29.4", "snapshot"]'), matrix.emacs_version)
         run: .emacs.d/.ci/batch-flycheck.sh