Skip to content

Commit

Permalink
[fu] ci - flycheck - try home checkout
Browse files Browse the repository at this point in the history
  • Loading branch information
pkryger committed Nov 20, 2024
1 parent 28e70bc commit 03b802a
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .ci/batch-byte-compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci/batch-checkdoc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci/batch-flycheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci/first-start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci/unit-test-cl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion .ci/unit-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 03b802a

Please sign in to comment.