ci: try to fix macos-latest action

macos-latest is arm64 now
This commit is contained in:
kevinhwang91 2024-08-05 07:17:21 +08:00
parent 512b9c8504
commit 119e896101
2 changed files with 5 additions and 9 deletions

View file

@ -46,10 +46,10 @@ jobs:
name: Install Neovim on Macos
run: |
cd
curl -LO https://github.com/neovim/neovim/releases/download/${{ matrix.version }}/nvim-macos-x86_64.tar.gz
tar xzf nvim-macos-x86_64.tar.gz
echo "${PWD}/nvim-macos-x86_64/bin" >> $GITHUB_PATH
export PATH="${PWD}/nvim-macos-x86_64/bin:${PATH}"
curl -LO https://github.com/neovim/neovim/releases/download/${{ matrix.version }}/nvim-macos-arm64.tar.gz
tar xzf nvim-macos-arm64.tar.gz
echo "${PWD}/nvim-macos-arm64/bin" >> $GITHUB_PATH
export PATH="${PWD}/nvim-macos-arm64/bin:${PATH}"
nvim -v
- name: Run Test

View file

@ -12,10 +12,6 @@ LUA_NUMBER := $(word 2,$(LUA_VERSION))
TARGET_DIR := $(DEPS)/$(LUA_NUMBER)
HEREROCKS ?= $(DEPS)/hererocks.py
UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Darwin)
HEREROCKS_ENV ?= MACOSX_DEPLOYMENT_TARGET=10.15
endif
HEREROCKS_URL ?= https://raw.githubusercontent.com/luarocks/hererocks/master/hererocks.py
HEREROCKS_ACTIVE := source $(TARGET_DIR)/bin/activate
@ -53,7 +49,7 @@ $(HEREROCKS):
curl $(HEREROCKS_URL) -o $@
$(LUAROCKS): $(HEREROCKS)
$(HEREROCKS_ENV) python $< $(TARGET_DIR) --$(LUA_VERSION) -r latest
$(HEREROCKS_ENV) python3 $< $(TARGET_DIR) --$(LUA_VERSION) -r latest
$(BUSTED): $(LUAROCKS)
$(HEREROCKS_ACTIVE) && luarocks install busted