Skip to content

Commit c92c152

Browse files
committed
ci: revert merge of nightly branch
The nightly branch is required because the GHA CI doesn't actually do the build, and snapcraft requires it to be like this. snapcraft consumes each branch and runs the `snapcraft.yaml`.
1 parent e5d88e2 commit c92c152

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

.github/workflows/update-readme.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ on:
66
- cron: '45 11 * * *'
77

88
jobs:
9-
update_readme:
9+
# Updates the timestamp in README.md, which triggers a "push" event.
10+
bump_timestamp:
1011
permissions:
1112
contents: write
1213
runs-on: ubuntu-latest

snap/snapcraft.yaml

+3-14
Original file line numberDiff line numberDiff line change
@@ -32,28 +32,17 @@ apps:
3232
desktop: usr/share/applications/nvim.desktop
3333

3434
parts:
35-
name: publish ${{ matrix.nvimbranch }}
36-
strategy:
37-
fail-fast: false
38-
matrix:
39-
nvimbranch: [ stable, nightly ]
4035
nvim:
4136
source: https://github.com/neovim/neovim.git
4237
override-pull: |
4338
craftctl default
44-
branch="${{ matrix.nvimbranch }}"
39+
branch="stable"
4540
git checkout tags/${branch} -b ${branch}
4641
major="$(awk '/NVIM_VERSION_MAJOR/{gsub(")","",$2); print $2}' CMakeLists.txt)"
4742
minor="$(awk '/NVIM_VERSION_MINOR/{gsub(")","",$2); print $2}' CMakeLists.txt)"
4843
patch="$(awk '/NVIM_VERSION_PATCH/{gsub(")","",$2); print $2}' CMakeLists.txt)"
49-
if [ stable = "${{ matrix.nvimbranch }}" ] ; then
50-
version="v$major.$minor.$patch"
51-
craftctl set version="${version}"
52-
else
53-
version_prefix="v$major.$minor.$patch"
54-
git_described="$(git describe --first-parent 2> /dev/null | perl -lpe 's/v\d.\d.\d-//g' | perl -lpe 's/-/+/g')"
55-
craftctl set version="${version_prefix}-${git_described}"
56-
fi
44+
version="v$major.$minor.$patch"
45+
craftctl set version="${version}"
5746
plugin: make
5847
override-build: |
5948
echo "Building on $SNAP_ARCH"

0 commit comments

Comments
 (0)