Skip to content

Commit

Permalink
Merge branch 'master' into dotted-latin
Browse files Browse the repository at this point in the history
  • Loading branch information
elijah-potter committed Jan 31, 2025
2 parents 47b1a18 + 40f6138 commit 42ce33f
Show file tree
Hide file tree
Showing 79 changed files with 1,814 additions and 659 deletions.
30 changes: 30 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: bug
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Platform**
What platform has the issue? Is it in Obsidian, Neovim, or Visual Studio Code? Something else?

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/report-grammatical-error.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Report Grammatical Error
about: If a grammatical error is not found by Harper, let us tus now
title: ''
labels: enhancement, harper-core, linting
assignees: ''

---

## Description

Give a detailed description of the grammatical error Harper should be able to find.

## Resources

If there are any resources online we can reference that described grammatical rules, let us know.

## Examples

Please provide at least three examples of the grammatical error in real text.
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ updates:
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "npm"
directory: "/packages"
schedule:
interval: "weekly"
2 changes: 1 addition & 1 deletion .github/workflows/build_harper_binaries.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Release
name: Build Binaries

on:
push:
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/build_web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,26 @@ name: Build Web

on:
push:
branches: ["master", "web-prod"]
branches: ['master', 'web-prod']
pull_request:
branches: ["master"]
branches: ['master']

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
- name: Retrieve version after install
id: nodenv
run: echo "node-version=$(node -v | sed 's/^v//')" >> $GITHUB_OUTPUT
- uses: redhat-actions/buildah-build@v2
with:
image: web
layers: false
containerfiles: |
Dockerfile
build-args: NODE_VERSION=${{ steps.nodenv.outputs.node-version }}-slim
118 changes: 118 additions & 0 deletions .github/workflows/release_harper_binaries.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
name: Release Binaries

on:
push:
tags:
- "v*"

jobs:
release:
name: Release ${{ matrix.platform.project }} - ${{ matrix.platform.release_for }}
if: github.event.pull_request.draft == false
strategy:
matrix:
platform:
- release_for: Windows-x86_64
os: windows-latest
target: x86_64-pc-windows-msvc
project: harper-ls
bin: harper-ls.exe
name: harper-ls-x86_64-pc-windows-msvc.zip
command: build
- release_for: macOS-x86_64
os: macOS-latest
target: x86_64-apple-darwin
project: harper-ls
bin: harper-ls
name: harper-ls-x86_64-apple-darwin.tar.gz
command: build
- release_for: macOS-aarch64
os: macOS-latest
target: aarch64-apple-darwin
project: harper-ls
bin: harper-ls
name: harper-ls-aarch64-apple-darwin.tar.gz
command: build
- release_for: Linux-x86_64-GNU
os: ubuntu-20.04
target: x86_64-unknown-linux-gnu
project: harper-ls
bin: harper-ls
name: harper-ls-x86_64-unknown-linux-gnu.tar.gz
command: build
- release_for: Linux-aarch64-GNU
os: ubuntu-20.04
target: aarch64-unknown-linux-gnu
project: harper-ls
bin: harper-ls
name: harper-ls-aarch64-unknown-linux-gnu.tar.gz
command: build

- release_for: Windows-x86_64
os: windows-latest
target: x86_64-pc-windows-msvc
project: harper-cli
bin: harper-cli.exe
name: harper-cli-x86_64-pc-windows-msvc.zip
command: build
- release_for: macOS-x86_64
os: macOS-latest
target: x86_64-apple-darwin
project: harper-cli
bin: harper-cli
name: harper-cli-x86_64-apple-darwin.tar.gz
command: build
- release_for: macOS-aarch64
os: macOS-latest
target: aarch64-apple-darwin
project: harper-cli
bin: harper-cli
name: harper-cli-aarch64-apple-darwin.tar.gz
command: build
- release_for: Linux-x86_64-GNU
os: ubuntu-20.04
target: x86_64-unknown-linux-gnu
project: harper-cli
bin: harper-cli
name: harper-cli-x86_64-unknown-linux-gnu.tar.gz
command: build
- release_for: Linux-aarch64-GNU
os: ubuntu-20.04
target: aarch64-unknown-linux-gnu
project: harper-cli
bin: harper-cli
name: harper-cli-aarch64-unknown-linux-gnu.tar.gz
command: build

runs-on: ${{ matrix.platform.os }}
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Build binary
uses: houseabsolute/actions-rust-cross@v0
with:
command: ${{ matrix.platform.command }}
target: ${{ matrix.platform.target }}
args: "--locked --release --bin ${{ matrix.platform.project }}"
strip: true
- name: Package as archive
shell: bash
run: |
cd target/${{ matrix.platform.target }}/release
if [[ "${{ matrix.platform.os }}" == "windows-latest" ]]; then
7z a ../../../${{ matrix.platform.name }} ${{ matrix.platform.bin }}
else
tar czvf ../../../${{ matrix.platform.name }} ${{ matrix.platform.bin }}
fi
cd -
- uses: ncipollo/release-action@v1
with:
artifacts: ${{ matrix.platform.name }}
allowUpdates: true
draft: true
- name: Upload Artifacts
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.platform.bin }}-${{ matrix.platform.target }}
path: ${{ matrix.platform.name }}

77 changes: 77 additions & 0 deletions .github/workflows/release_vscode_plugin.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
name: Release VS Code Plugin

on:
push:
tags:
- "v*"

jobs:
package:
name: Package - ${{ matrix.platform.code_target }}
if: github.event.pull_request.draft == false
strategy:
matrix:
platform:
- os: windows-latest
rust_target: x86_64-pc-windows-msvc
code_target: win32-x64
- os: macOS-latest
rust_target: x86_64-apple-darwin
code_target: darwin-x64
- os: macOS-latest
rust_target: aarch64-apple-darwin
code_target: darwin-arm64
- os: ubuntu-20.04
rust_target: x86_64-unknown-linux-gnu
code_target: linux-x64
- os: ubuntu-20.04
rust_target: aarch64-unknown-linux-gnu
code_target: linux-arm64
runs-on: ${{ matrix.platform.os }}
steps:
- uses: actions/checkout@v4
- uses: extractions/setup-just@v2
- uses: actions/setup-node@v4
with:
node-version: 20
- name: Build harper-ls
uses: houseabsolute/actions-rust-cross@v0
with:
target: ${{ matrix.platform.rust_target }}
args: "--locked --release --bin harper-ls"
strip: true
- name: Package extension
id: package_extension
shell: bash
run: |
bin_dir="packages/vscode-plugin/bin"
release_dir="target/${{ matrix.platform.rust_target }}/release"
mkdir "$bin_dir"
if [[ "${{ matrix.platform.os }}" == "windows-latest" ]]; then
cp "${release_dir}/harper-ls.exe" "$bin_dir"
else
cp "${release_dir}/harper-ls" "$bin_dir"
fi
just package-vscode ${{ matrix.platform.code_target }}
echo artifact=$(echo packages/vscode-plugin/*.vsix) >> $GITHUB_OUTPUT
- uses: ncipollo/release-action@v1
with:
artifacts: "./packages/vscode-plugin/*.vsix"
allowUpdates: true
draft: true
- name: Publish to OpenVSX
uses: HaaLeo/publish-vscode-extension@v1
with:
pat: ${{ secrets.OPEN_VSX_TOKEN }}
packagePath: "./packages/vscode-plugin/"
extensionFile: ${{ steps.package_extension.outputs.artifact }}
- name: Publish to the Visual Studio Marketplace
uses: HaaLeo/publish-vscode-extension@v1
with:
pat: ${{ secrets.VS_MARKETPLACE_TOKEN }}
packagePath: "./packages/vscode-plugin/"
extensionFile: ${{ steps.package_extension.outputs.artifact }}
registryUrl: https://marketplace.visualstudio.com
1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lts/iron
Loading

0 comments on commit 42ce33f

Please sign in to comment.