Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mawww/kakoune
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2020.01.16
Choose a base ref
...
head repository: mawww/kakoune
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing 1,097 changed files with 25,267 additions and 11,108 deletions.
20 changes: 20 additions & 0 deletions .builds/debian-arm64.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
image: debian/unstable
arch: arm64
packages:
- clang
- make
- gcc
tasks:
- clang-build: |
cd kakoune
make CXX=clang++ -j$(nproc)
- clang-test: |
cd kakoune
LC_ALL=C.utf8 make test
- gcc-build: |
cd kakoune
make clean
make CXX=g++ -j$(nproc)
- gcc-test: |
cd kakoune
LC_ALL=C.utf8 make test
19 changes: 19 additions & 0 deletions .builds/debian.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
image: debian/stable
packages:
- clang
- gcc
- make
tasks:
- clang-build: |
cd kakoune
make CXX=clang++ -j$(nproc)
- clang-test: |
cd kakoune
LC_ALL=C.utf8 make test
- gcc-build: |
cd kakoune
make clean
make CXX=g++ -j$(nproc)
- gcc-test: |
cd kakoune
LC_ALL=C.utf8 make test
17 changes: 17 additions & 0 deletions .builds/freebsd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
image: freebsd/latest
packages:
- gcc
tasks:
- build-clang: |
cd kakoune
make CXX=clang++ -j$(sysctl -n hw.ncpu)
- test-clang: |
cd kakoune
LC_ALL=en_US.UTF-8 make test
- build-gcc: |
cd kakoune
make clean
make CXX=g++ -j$(sysctl -n hw.ncpu)
- test-gcc: |
cd kakoune
LC_ALL=en_US.UTF-8 make test
11 changes: 11 additions & 0 deletions .builds/readme.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
image: archlinux
oauth: git.sr.ht/REPOSITORIES:RW git.sr.ht/PROFILE:RO
packages:
- hut
- asciidoctor
tasks:
- update-readme: |
cd kakoune
asciidoctor -e README.asciidoc
hut git update --readme README.html --repo https://git.sr.ht/~mawww/kakoune
32 changes: 18 additions & 14 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
freebsd_task:
freebsd_instance:
image_family: freebsd-12-1
gmake_script: pkg install -y gmake
image_family: freebsd-13-3
matrix:
- name: freebsd_clang
env:
@@ -10,7 +9,7 @@ freebsd_task:
gcc_script: pkg install -y gcc
env:
CXX: g++
test_script: gmake -j4 test
test_script: make CXX=$CXX -j$(sysctl -n hw.ncpu) test
env:
LC_ALL: en_US.UTF-8

@@ -22,27 +21,32 @@ linux_task:
matrix:
- name: linux_clang
container:
image: silkeh/clang:5
clang_script:
- apt-get -y install pkg-config libncursesw5-dev
image: silkeh/clang:13
env:
CXX: clang++
- name: linux_gcc
container:
image: gcc:7
test_script: make -j4 test
image: gcc:10
memory: 8G
env:
CXX: g++
test_script: make CXX=$CXX -j$(nproc) test
env:
LC_ALL: en_US.UTF-8

macos_task:
osx_instance:
image: mojave-base
macos_instance:
image: ghcr.io/cirruslabs/macos-ventura-base:latest
matrix:
- name: macos_clang
clang_script: brew install llvm@13
env:
CXX: clang++
CXX: /opt/homebrew/opt/llvm@13/bin/clang++
- name: macos_gcc
gcc_script: brew install gcc@7
gcc_script:
- /usr/sbin/softwareupdate --install-rosetta --agree-to-license
- arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
- arch -x86_64 /usr/local/bin/brew install gcc@12
env:
CXX: g++-7
test_script: make -j4 test
CXX: g++-12
test_script: make CXX=$CXX -j$(sysctl -n hw.ncpu) test
56 changes: 56 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: Bug report
description: Report an unexpected behaviour with the editor
labels: bug
title: "[BUG] "
body:

- type: markdown
attributes:
value: |
Please make sure to [search issues](https://github.com/mawww/kakoune/issues?q=is%3Aissue) before creating a new one, to avoid duplicates and centralise conversations.
If you need to have a question about the editor itself (options, behaviour, code…) answered, make sure to check the [documentation](https://github.com/mawww/kakoune/tree/master/doc/pages) (also available via the `doc` command in the editor) or drop by [IRC](https://web.libera.chat/?channels=#kakoune) to get instant feedback.
- type: input
attributes:
label: "Version of Kakoune"
description: "If unsure, use the output of command: `kak -version`"
placeholder: "v2020.12.31"
validations:
required: true

- type: textarea
attributes:
label: "Reproducer"
description: "What are the steps to follow to reproduce the issue?"
placeholder: |
If any specific configuration or environment settings are required to reproduce the issue, also describe them here.
validations:
required: true

- type: textarea
attributes:
label: "Outcome"
description: "What is the outcome of the reproducing steps above?"
validations:
required: true

- type: textarea
attributes:
label: "Expectations"
description: "What was the expected outcome of the reproducing steps above?"
validations:
required: true

- type: textarea
attributes:
label: "Additional information"
description: "Any other information that may be relevant to diagnosing the issue should be documented here"
placeholder: |
Examples of relevant information:
* What OS and distribution are you using?
* Are you running an experimental branch (i.e. not `master`)?
* Is the issue reproducible in other terminals?
validations:
required: false
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: true
contact_links:
- name: IRC channel
url: https://web.libera.chat/?channels=#kakoune
about: Ask your questions to get real time support on the official channel
62 changes: 62 additions & 0 deletions .github/ISSUE_TEMPLATE/crash_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
name: Crash report
description: Report a crash of the editor while in-use
labels: bug, crash
title: "[BUG][CRASH] "
body:

- type: markdown
attributes:
value: |
Please make sure to [search issues](https://github.com/mawww/kakoune/issues?q=is%3Aissue) before creating a new one, to avoid duplicates and centralise conversations.
If you need to have a question about the editor itself (options, behaviour, code…) answered, make sure to check the [documentation](https://github.com/mawww/kakoune/tree/master/doc/pages) (also available via the `doc` command in the editor) or drop by [IRC](https://web.libera.chat/?channels=#kakoune) to get instant feedback.
- type: input
attributes:
label: "Version of Kakoune"
description: "If unsure, use the output of command: `kak -version`"
placeholder: "v2020.12.31"
validations:
required: true

- type: textarea
attributes:
label: "Reproducer"
description: "What are the steps to follow to reproduce the issue?"
placeholder: |
If any specific configuration or environment settings are required to reproduce the issue, also describe them here.
validations:
required: true

- type: textarea
attributes:
label: "Outcome"
description: "What is the outcome of the reproducing steps above?"
placeholder: |
If the editor printed any error messages, or if you managed to obtain a backtrace, also document them here. Make sure to demangle the stacktrace by passing it to the `c++filt` command.
Note that triggering the issue in the editor compiled in debug mode will produce more helpful messages, please consider re-building with `make debug=yes` to help us out.
validations:
required: true

- type: textarea
attributes:
label: "Expectations"
description: "What was the expected outcome of the reproducing steps above?"
placeholder: |
If the reproducing steps are self-evident, the expectations are simply “the editor should not crash”. In that case, you may ignore this field.
validations:
required: false

- type: textarea
attributes:
label: "Additional information"
description: "Any other information that may be relevant to diagnosing the issue should be documented here"
placeholder: |
Examples of relevant information:
* What OS and distribution are you using?
* Are you running an experimental branch (i.e. not `master`)?
* Is the issue reproducible in other terminals?
validations:
required: false
28 changes: 28 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Feature request
description: Ask for a feature to be implemented and included in the next release
labels: feature request
title: "[REQUEST] "
body:

- type: markdown
attributes:
value: |
Please make sure to [search issues](https://github.com/mawww/kakoune/issues?q=is%3Aissue) before creating a new one, to avoid duplicates and centralise conversations.
If you need to have a question about the editor itself (options, behaviour, code…) answered, make sure to check the [documentation](https://github.com/mawww/kakoune/tree/master/doc/pages) (also available via the `doc` command in the editor) or drop by [IRC](https://web.libera.chat/?channels=#kakoune) to get instant feedback.
- type: textarea
attributes:
label: "Feature"
description: "What do you want implemented that is not already available in the development version?"
validations:
required: true

- type: textarea
attributes:
label: "Usecase"
description: "What use do you have for the requested feature?"
placeholder: |
If the feature's usecase is self-evident, such as a hook or an option whose name hints at a functionality unequivocally, you may ignore this field.
validations:
required: false
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/question.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Question
description: Couldn't find an answer in the documentation? Ask away!
labels: question
title: "[QUESTION] "
body:

- type: markdown
attributes:
value: |
Please make sure to [search issues](https://github.com/mawww/kakoune/issues?q=is%3Aissue) before creating a new one, to avoid duplicates and centralise conversations.
If you need to have a question about the editor itself (options, behaviour, code…) answered, make sure to check the [documentation](https://github.com/mawww/kakoune/tree/master/doc/pages) (also available via the `doc` command in the editor) or drop by [IRC](https://web.libera.chat/?channels=#kakoune) to get instant feedback.
- type: textarea
attributes:
label: "Question"
description: "Couldn't find an answer in the documentation? Ask away!"
validations:
required: true
7 changes: 7 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<!--
If this is your first contribution to the Kakoune project, make sure to
include an empty "waiver" commit to your Pull Request, as described in the
following document:
https://github.com/mawww/kakoune/blob/master/CONTRIBUTING
-->
10 changes: 0 additions & 10 deletions .github/issue_template.md

This file was deleted.

27 changes: 27 additions & 0 deletions .github/workflows/build-releases-linux.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Build static binaries for Linux

on:
release:
types: [published, edited]

jobs:
build:
runs-on: ubuntu-latest
container:
image: alpine:latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
ref: ${{ github.event.release.tag_name }}
- name: Prepare
run: apk add --no-cache binutils bzip2 g++ git make tar
- name: Build
run: |
mkdir -p kakoune-${{ github.event.release.tag_name }}-linux/
make -j$(nproc) PREFIX=$(pwd)/kakoune-${{ github.event.release.tag_name }}-linux static=yes install strip
tar cvjf kakoune-${{ github.event.release.tag_name }}-linux.tar.bz2 kakoune-${{ github.event.release.tag_name }}-linux/
- name: Upload
uses: softprops/action-gh-release@v1
with:
files: kakoune-${{ github.event.release.tag_name }}-linux.tar.bz2
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
*.o
.*.d
*.d
*.pyc
*.1-r
.*.kak.*
*.tar*
src/kak
src/kak.debug
src/kak.debug.san_*
src/kak.opt
src/kak.opt.san_*
src/.version*
src/.*.json
doc/kak.1.gz
Loading