Skip to content

Commit

Permalink
Cask rapprochement
Browse files Browse the repository at this point in the history
I heard it's under new management.  See commits c076219 c92102f.
  • Loading branch information
dickmao committed Apr 10, 2021
1 parent accd430 commit f3a5b43
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- uses: actions/cache@v1
with:
path: ~/.cask
key: cask-001
key: cask-002

- name: paths
run: |
Expand Down Expand Up @@ -84,21 +84,21 @@ jobs:
run: |
sh tools/install-cask.sh
cask link list
continue-on-error: ${{ matrix.emacs_version == '24.5' }}
continue-on-error: ${{ matrix.emacs_version == 'snapshot' }}

- name: lint
if: |
startsWith(matrix.python_version, '3') &&
startsWith(matrix.emacs_version, '27')
run: make lint
continue-on-error: ${{ matrix.emacs_version == '24.5' }}
continue-on-error: ${{ matrix.emacs_version == 'snapshot' }}

- name: test-install
if: startsWith(matrix.python_version, '2')
run: make test-install
continue-on-error: ${{ matrix.emacs_version == '24.5' }}
continue-on-error: ${{ matrix.emacs_version == 'snapshot' }}

- name: test
if: startsWith(matrix.python_version, '2')
run: make test
continue-on-error: ${{ matrix.emacs_version == '24.5' }}
continue-on-error: ${{ matrix.emacs_version == 'snapshot' }}
1 change: 0 additions & 1 deletion request.el
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,6 @@ as there's already precedent with `request-response-header', I
hew to consistency."
(let ((raw-header (request-response--raw-header response)))
(when raw-header
raw-header
(with-temp-buffer
(save-excursion (insert raw-header))
(when (save-excursion (request--parse-response-at-point))
Expand Down
2 changes: 1 addition & 1 deletion tools/melpazoid.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

EMACS="${EMACS:=emacs}"
BASENAME=$(basename "$1")
PYTHON=$(which python3.6)
PYTHON=$(which python3.6 || true)
PYTHON="${PYTHON:-python}"

if [[ -z $(du -s melpazoid-master 2>/dev/null | cut -f1) ]] || \
Expand Down

0 comments on commit f3a5b43

Please sign in to comment.