Skip to content

Commit

Permalink
Merge branch 'master' into agda
Browse files Browse the repository at this point in the history
  • Loading branch information
the-mikedavis committed Dec 15, 2023
2 parents 678b862 + 33d8560 commit 267ebf1
Show file tree
Hide file tree
Showing 147 changed files with 5,325 additions and 2,056 deletions.
1 change: 1 addition & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
watch_file shell.nix
watch_file flake.lock
watch_file rust-toolchain.toml

# try to use flakes, if it fails use normal nix (ie. shell.nix)
use flake || use nix
Expand Down
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,16 @@ body:
placeholder: wezterm 20220101-133340-7edc5b5a
validations:
required: true
- type: input
id: installation-method
attributes:
label: Installation Method
description: >
How you installed Helix - from a package manager like Homebrew or the
AUR, built from source, downloaded a binary from the releases page, etc.
placeholder: "source / brew / nixpkgs / flake / releases page"
validations:
required: true
- type: input
id: helix-version
attributes:
Expand Down
14 changes: 11 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ jobs:
override: true

- uses: Swatinem/rust-cache@v2
with:
shared-key: "build"

- name: Run cargo check
run: cargo check
Expand All @@ -37,9 +39,11 @@ jobs:
uses: actions/checkout@v4

- name: Install stable toolchain
uses: dtolnay/rust-toolchain@1.65
uses: dtolnay/rust-toolchain@1.70

- uses: Swatinem/rust-cache@v2
with:
shared-key: "build"

- name: Cache test tree-sitter grammar
uses: actions/cache@v3
Expand All @@ -66,11 +70,13 @@ jobs:
uses: actions/checkout@v4

- name: Install stable toolchain
uses: dtolnay/rust-toolchain@1.65
uses: dtolnay/rust-toolchain@1.70
with:
components: rustfmt, clippy

- uses: Swatinem/rust-cache@v2
with:
shared-key: "build"

- name: Run cargo fmt
run: cargo fmt --all --check
Expand All @@ -91,9 +97,11 @@ jobs:
uses: actions/checkout@v4

- name: Install stable toolchain
uses: dtolnay/rust-toolchain@1.65
uses: dtolnay/rust-toolchain@1.70

- uses: Swatinem/rust-cache@v2
with:
shared-key: "build"

- name: Validate queries
run: cargo xtask query-check
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cachix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
uses: actions/checkout@v4

- name: Install nix
uses: cachix/install-nix-action@v23
uses: cachix/install-nix-action@v24

- name: Authenticate with Cachix
uses: cachix/cachix-action@v12
uses: cachix/cachix-action@v13
with:
name: helix
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ jobs:
OUTDIR=$(basename ${{ github.ref }})
echo "OUTDIR=$OUTDIR" >> $GITHUB_ENV
- name: Deploy
- name: Deploy stable
uses: peaceiris/actions-gh-pages@v3
if: startswith(github.ref, 'refs/tags/')
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./book/book
destination_dir: ./${{ env.OUTDIR }}

- name: Deploy stable
- name: Deploy
uses: peaceiris/actions-gh-pages@v3
if: startswith(github.ref, 'refs/tags/')
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./book/book
destination_dir: ./${{ env.OUTDIR }}
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ jobs:
rust: stable
target: aarch64-unknown-linux-gnu
cross: true
- build: riscv64-linux
os: ubuntu-latest
rust: stable
target: riscv64gc-unknown-linux-gnu
cross: true
# - build: riscv64-linux
# os: ubuntu-latest
# rust: stable
# target: riscv64gc-unknown-linux-gnu
# cross: true
- build: x86_64-macos
os: macos-latest
rust: stable
Expand Down
260 changes: 260 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

Loading

0 comments on commit 267ebf1

Please sign in to comment.