summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-10-10 22:34:36 +0200
committerBram Moolenaar <Bram@vim.org>2020-10-10 22:34:36 +0200
commitbd6428b9e79ed85b54ea7eaa11871fa09d63ab6f (patch)
tree3a6c961f7ca609035f2d530754daaf2d386072cf
parent1b1e9df78b9ff98cc5ccff359bead37ce5c54d6b (diff)
patch 8.2.1829: warnings when executing Github actionsv8.2.1829
Problem: Warnings when executing Github actions. Solution: Use another method to set environment variables. (Ken Takata, closes #7107)
-rw-r--r--.github/workflows/ci-windows.yaml4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/.github/workflows/ci-windows.yaml b/.github/workflows/ci-windows.yaml
index 6a5501f249..917783019d 100644
--- a/.github/workflows/ci-windows.yaml
+++ b/.github/workflows/ci-windows.yaml
@@ -74,8 +74,8 @@ jobs:
git config --global core.autocrlf input
python_dir=$(cat "/proc/${{ matrix.cygreg }}/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON_VER_DOT}/InstallPath/@")
python3_dir=$(cat "/proc/${{ matrix.cygreg }}/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON3_VER_DOT}${{ matrix.pyreg }}/InstallPath/@")
- echo "::set-env name=PYTHON_DIR::$python_dir"
- echo "::set-env name=PYTHON3_DIR::$python3_dir"
+ echo "PYTHON_DIR=$python_dir" >> $GITHUB_ENV
+ echo "PYTHON3_DIR=$python3_dir" >> $GITHUB_ENV
- uses: msys2/setup-msys2@v2
if: matrix.toolchain == 'mingw'
diff --git a/src/version.c b/src/version.c
index abec6fbc0e..388932fd5f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1829,
+/**/
1828,
/**/
1827,