Skip to content

Commit df033d4

Browse files
committed
ci: aaaaarch [skip ci]
1 parent 1ce1c22 commit df033d4

File tree

4 files changed

+23
-19
lines changed

4 files changed

+23
-19
lines changed

.github/workflows/notes.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ Note: On Windows "Server" you may need to [install vcruntime140.dll](https://lea
2727
3. Extract: `tar xzvf nvim-macos-x86_64.tar.gz`
2828
4. Run `./nvim-macos-x86_64/bin/nvim`
2929

30-
### macOS (arm64)
30+
### macOS (aarch64)
3131

32-
1. Download **nvim-macos-arm64.tar.gz**
33-
2. Run `xattr -c ./nvim-macos-arm64.tar.gz` (to avoid "unknown developer" warning)
34-
3. Extract: `tar xzvf nvim-macos-arm64.tar.gz`
35-
4. Run `./nvim-macos-arm64/bin/nvim`
32+
1. Download **nvim-macos-aarch64.tar.gz**
33+
2. Run `xattr -c ./nvim-macos-aarch64.tar.gz` (to avoid "unknown developer" warning)
34+
3. Extract: `tar xzvf nvim-macos-aarch64.tar.gz`
35+
4. Run `./nvim-macos-aarch64/bin/nvim`
3636

3737
### Linux (x86_64)
3838

@@ -91,7 +91,7 @@ ${SHA_LINUX_AARCH64_TAR}
9191
${SHA_APPIMAGE_X86_64}
9292
${SHA_APPIMAGE_X86_64_ZSYNC}
9393
${SHA_LINUX_X86_64_TAR}
94-
${SHA_MACOS_ARM64}
94+
${SHA_MACOS_AARCH64}
9595
${SHA_MACOS_X86_64}
9696
${SHA_WIN_64_MSI}
9797
${SHA_WIN_64_ZIP}

.github/workflows/release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
- runner: macos-13
100100
arch: x86_64
101101
- runner: macos-14
102-
arch: arm64
102+
arch: aarch64
103103
runs-on: ${{ matrix.runner }}
104104
env:
105105
MACOSX_DEPLOYMENT_TARGET: 11.0
@@ -233,11 +233,11 @@ jobs:
233233
cd ./nvim-macos-x86_64
234234
sha256sum nvim-macos-x86_64.tar.gz > nvim-macos-x86_64.tar.gz.sha256sum
235235
echo "SHA_MACOS_X86_64=$(cat nvim-macos-x86_64.tar.gz.sha256sum)" >> $GITHUB_ENV
236-
- name: Generate macos arm64 SHA256 checksums
236+
- name: Generate macos aarch64 SHA256 checksums
237237
run: |
238-
cd ./nvim-macos-arm64
239-
sha256sum nvim-macos-arm64.tar.gz > nvim-macos-arm64.tar.gz.sha256sum
240-
echo "SHA_MACOS_ARM64=$(cat nvim-macos-arm64.tar.gz.sha256sum)" >> $GITHUB_ENV
238+
cd ./nvim-macos-aarch64
239+
sha256sum nvim-macos-aarch64.tar.gz > nvim-macos-aarch64.tar.gz.sha256sum
240+
echo "SHA_MACOS_AARCH64=$(cat nvim-macos-aarch64.tar.gz.sha256sum)" >> $GITHUB_ENV
241241
- name: Generate Win64 SHA256 checksums
242242
run: |
243243
cd ./nvim-win64
@@ -261,6 +261,6 @@ jobs:
261261
run: |
262262
envsubst < "$GITHUB_WORKSPACE/.github/workflows/notes.md" > "$RUNNER_TEMP/notes.md"
263263
if [ "$TAG_NAME" != "nightly" ]; then
264-
gh release create stable $PRERELEASE --notes-file "$RUNNER_TEMP/notes.md" --title "$SUBJECT" --target $GITHUB_SHA nvim-macos-x86_64/* nvim-macos-arm64/* nvim-linux-x86_64/* nvim-linux-aarch664/* appimage-x86_64/* appimage-aarc64/* nvim-win64/*
264+
gh release create stable $PRERELEASE --notes-file "$RUNNER_TEMP/notes.md" --title "$SUBJECT" --target $GITHUB_SHA nvim-macos-x86_64/* nvim-macos-aarch64/* nvim-linux-x86_64/* nvim-linux-aarch664/* appimage-x86_64/* appimage-aarc64/* nvim-win64/*
265265
fi
266-
gh release create $TAG_NAME $PRERELEASE --notes-file "$RUNNER_TEMP/notes.md" --title "$SUBJECT" --target $GITHUB_SHA nvim-macos-x86_64/* nvim-macos-arm64/* nvim-linux-x86_64/* nvim-linux-aarch64/* appimage-x86_64/* appimage-aarch64/* nvim-win64/*
266+
gh release create $TAG_NAME $PRERELEASE --notes-file "$RUNNER_TEMP/notes.md" --title "$SUBJECT" --target $GITHUB_SHA nvim-macos-x86_64/* nvim-macos-aarch64/* nvim-linux-x86_64/* nvim-linux-aarch64/* appimage-x86_64/* appimage-aarch64/* nvim-win64/*

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ if(XCODE)
1919
message(FATAL_ERROR [[Xcode generator is not supported. Use "Ninja" or "Unix Makefiles" instead]])
2020
endif()
2121

22+
if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
23+
set(CMAKE_SYSTEM_PROCESSOR aarch64)
24+
endif()
25+
2226
# Point CMake at any custom modules we may ship
2327
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
2428

INSTALL.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Downloads are available on the [Releases](https://github.com/neovim/neovim/relea
1616

1717
* Latest [stable release](https://github.com/neovim/neovim/releases/latest)
1818
* [macOS x86_64](https://github.com/neovim/neovim/releases/latest/download/nvim-macos-x86_64.tar.gz)
19-
* [macOS arm64](https://github.com/neovim/neovim/releases/latest/download/nvim-macos-arm64.tar.gz)
19+
* [macOS aarch64](https://github.com/neovim/neovim/releases/latest/download/nvim-macos-aarch64.tar.gz)
2020
* [Linux x86_64](https://github.com/neovim/neovim/releases/latest/download/nvim-linux-x86_64.tar.gz)
2121
* [Linux aarch64](https://github.com/neovim/neovim/releases/latest/download/nvim-linux-aarch64.tar.gz)
2222
* [Windows](https://github.com/neovim/neovim/releases/latest/download/nvim-win64.msi)
@@ -86,11 +86,11 @@ For x86_64:
8686
tar xzf nvim-macos-x86_64.tar.gz
8787
./nvim-macos-x86_64/bin/nvim
8888
89-
For arm64:
89+
For aarch64:
9090
91-
curl -LO https://github.com/neovim/neovim/releases/download/nightly/nvim-macos-arm64.tar.gz
92-
tar xzf nvim-macos-arm64.tar.gz
93-
./nvim-macos-arm64/bin/nvim
91+
curl -LO https://github.com/neovim/neovim/releases/download/nightly/nvim-macos-aarch64.tar.gz
92+
tar xzf nvim-macos-aarch64.tar.gz
93+
./nvim-macos-aarch64/bin/nvim
9494
9595
### [Homebrew](https://brew.sh) on macOS or Linux
9696
@@ -119,7 +119,7 @@ Then add this to your shell config (`~/.bashrc`, `~/.zshrc`, ...):
119119

120120
### AppImage ("universal" Linux package)
121121

122-
The [Releases](https://github.com/neovim/neovim/releases) page provides an [AppImage](https://appimage.org) that runs on most Linux systems. No installation is needed, just download `nvim-linux-x86_64.appimage` and run it. (It might not work if your Linux distribution is more than 4 years old.) The following instructions assume an `x86_64` architecture; on ARM Linux replace with `aarch64`.
122+
The [Releases](https://github.com/neovim/neovim/releases) page provides an [AppImage](https://appimage.org) that runs on most Linux systems. No installation is needed, just download `nvim-linux-x86_64.appimage` and run it. (It might not work if your Linux distribution is more than 4 years old.) The following instructions assume an `x86_64` architecture; on AARCH Linux replace with `aarch64`.
123123

124124
curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim-linux-86_64.appimage
125125
chmod u+x nvim-linux-x86_64.appimage

0 commit comments

Comments
 (0)