Skip to content

Commit 503af55

Browse files
authored
Merge #579 from wookayin/ci-macos
fix(ci): macOS CI failing with python{3.7, 3.8, 3.9}
2 parents 31550a7 + a6175a4 commit 503af55

File tree

1 file changed

+38
-25
lines changed

1 file changed

+38
-25
lines changed

.github/workflows/test.yml

+38-25
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,21 @@ jobs:
3232
exclude:
3333
- os: 'ubuntu-latest'
3434
python-version: '3.7'
35+
- os: 'macos-latest'
36+
python-version: '3.7'
37+
- os: 'macos-latest'
38+
python-version: '3.8'
39+
- os: 'macos-latest'
40+
python-version: '3.9'
3541
include:
3642
- os: 'ubuntu-20.04'
3743
python-version: '3.7'
38-
NIGHTLY: nvim-linux64.tar.gz
39-
NVIM_BIN_PATH: nvim-linux64/bin
40-
EXTRACT: tar xzf
41-
- os: 'ubuntu-latest'
42-
NIGHTLY: nvim-linux64.tar.gz
43-
NVIM_BIN_PATH: nvim-linux64/bin
44-
EXTRACT: tar xzf
45-
- os: 'macos-latest'
46-
NIGHTLY: nvim-macos-x86_64.tar.gz
47-
NVIM_BIN_PATH: nvim-macos-x86_64/bin
48-
EXTRACT: tar xzf
49-
- os: 'windows-latest'
50-
NIGHTLY: nvim-win64.zip
51-
NVIM_BIN_PATH: nvim-win64/bin
52-
EXTRACT: unzip
44+
- os: 'macos-12'
45+
python-version: '3.7'
46+
- os: 'macos-12'
47+
python-version: '3.8'
48+
- os: 'macos-12'
49+
python-version: '3.9'
5350

5451
name: "test (python ${{ matrix.python-version }}, ${{ matrix.os }})"
5552
runs-on: ${{ matrix.os }}
@@ -60,20 +57,36 @@ jobs:
6057
cache: 'pip'
6158
python-version: ${{ matrix.python-version }}
6259

63-
- name: update path (bash)
60+
- name: install neovim (Linux/macOS)
6461
if: runner.os != 'Windows'
65-
run: echo "$(pwd)/${{ matrix.NVIM_BIN_PATH }}" >> $GITHUB_PATH
62+
run: |
63+
set -eu -o pipefail
6664
67-
- name: update path (windows)
68-
if: runner.os == 'Windows'
69-
run: echo "$(pwd)/${{ matrix.NVIM_BIN_PATH }}" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
65+
if [[ "$RUNNER_OS" == "Linux" ]]; then
66+
BASE="nvim-linux64"
67+
elif [[ "$RUNNER_OS" == "macOS" ]]; then
68+
BASE="nvim-macos-x86_64"
69+
else
70+
echo "$RUNNER_OS not supported"; exit 1;
71+
fi
72+
73+
curl -LO "https://github.com/neovim/neovim/releases/download/nightly/${BASE}.tar.gz"
74+
tar xzf "${BASE}.tar.gz"
75+
echo "RUNNER_OS = $RUNNER_OS"
76+
$BASE/bin/nvim --version
7077
71-
- name: install neovim
78+
# update $PATH for later steps
79+
echo "$(pwd)/$BASE/bin" >> $GITHUB_PATH
80+
81+
- name: install neovim (Windows)
82+
if: runner.os == 'Windows'
7283
run: |
73-
curl -LO 'https://github.com/neovim/neovim/releases/download/nightly/${{ matrix.NIGHTLY }}'
74-
${{ matrix.EXTRACT }} ${{ matrix.NIGHTLY }}
75-
echo '${{ runner.os }}'
76-
nvim --version
84+
curl -LO "https://github.com/neovim/neovim/releases/download/nightly/nvim-win64.zip"
85+
unzip nvim-win64.zip
86+
nvim-win64/bin/nvim --version
87+
88+
# update $PATH for later steps
89+
echo "$(pwd)/nvim-win64/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
7790
7891
- name: install dependencies
7992
run: |

0 commit comments

Comments
 (0)