diff options
Diffstat (limited to '.github')
| -rw-r--r-- | .github/scripts/env.ps1 | 9 | ||||
| -rw-r--r-- | .github/workflows/notes.md | 6 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/test.yml | 18 |
4 files changed, 16 insertions, 27 deletions
diff --git a/.github/scripts/env.ps1 b/.github/scripts/env.ps1 new file mode 100644 index 0000000000..d1dba5d558 --- /dev/null +++ b/.github/scripts/env.ps1 @@ -0,0 +1,9 @@ +# This script enables Developer Command Prompt +# See https://github.com/microsoft/vswhere/wiki/Start-Developer-Command-Prompt#using-powershell +$installationPath = vswhere.exe -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath +if ($installationPath -and (Test-Path "$installationPath\Common7\Tools\vsdevcmd.bat")) { + & "${env:COMSPEC}" /s /c "`"$installationPath\Common7\Tools\vsdevcmd.bat`" -arch=x64 -no_logo && set" | ForEach-Object { + $name, $value = $_ -split '=', 2 + "$name=$value" >> $env:GITHUB_ENV + } +} diff --git a/.github/workflows/notes.md b/.github/workflows/notes.md index 2b34c72ffa..0d62215fe4 100644 --- a/.github/workflows/notes.md +++ b/.github/workflows/notes.md @@ -9,14 +9,14 @@ ${NVIM_VERSION} #### Zip 1. Download **nvim-win64.zip** -2. Extract the zip. +2. Extract the zip 3. Run `nvim-qt.exe` #### MSI 1. Download **nvim-win64.msi** 2. Run the MSI -3. Search and run `nvim-qt.exe` or run `nvim.exe` on your CLI of choice. +3. Search and run `nvim-qt.exe` or run `nvim.exe` on your CLI of choice ### macOS @@ -38,8 +38,6 @@ ${NVIM_VERSION} #### Tarball -*(deprecated)* - 1. Download **nvim-linux64.tar.gz** 2. Extract: `tar xzvf nvim-linux64.tar.gz` 3. Run `./nvim-linux64/bin/nvim` diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 90702dc0a6..ebf5df7aac 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -102,15 +102,7 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Set env - run: | - $installationPath = vswhere.exe -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath - if ($installationPath -and (Test-Path "$installationPath\Common7\Tools\vsdevcmd.bat")) { - & "${env:COMSPEC}" /s /c "`"$installationPath\Common7\Tools\vsdevcmd.bat`" -arch=x64 -no_logo && set" | ForEach-Object { - $name, $value = $_ -split '=', 2 - "$name=$value" >> $env:GITHUB_ENV - } - } + - run: .github/scripts/env.ps1 - name: Build deps run: | cmake -S cmake.deps -B .deps -G Ninja -DCMAKE_BUILD_TYPE='RelWithDebInfo' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5f8e445f36..2fc6b13ec4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -199,7 +199,7 @@ jobs: - name: Build run: | - cmake -B build -G Ninja -D CMAKE_INSTALL_PREFIX:PATH=$INSTALL_PREFIX ${{ matrix.flags }} -D CI_BUILD=ON + cmake --preset ci -D CMAKE_INSTALL_PREFIX:PATH=$INSTALL_PREFIX ${{ matrix.flags }} cmake --build build - if: "!cancelled()" @@ -295,18 +295,8 @@ jobs: name: windows steps: - uses: actions/checkout@v3 - - uses: ./.github/actions/cache - - - name: Set env - run: | - $installationPath = vswhere.exe -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath - if ($installationPath -and (Test-Path "$installationPath\Common7\Tools\vsdevcmd.bat")) { - & "${env:COMSPEC}" /s /c "`"$installationPath\Common7\Tools\vsdevcmd.bat`" -arch=x64 -no_logo && set" | ForEach-Object { - $name, $value = $_ -split '=', 2 - "$name=$value" >> $env:GITHUB_ENV - } - } + - run: .github/scripts/env.ps1 - name: Build deps run: | @@ -315,7 +305,7 @@ jobs: - name: Build run: | - cmake -B build -G Ninja -D CMAKE_BUILD_TYPE='RelWithDebInfo' -D CI_BUILD=ON + cmake --preset ci -D CMAKE_BUILD_TYPE='RelWithDebInfo' cmake --build build - name: Install test deps @@ -405,5 +395,5 @@ jobs: - name: Build run: | - cmake -B build -G Ninja -D CI_BUILD=ON + cmake --preset ci cmake --build build |