Skip to content

Commit

Permalink
Merge branch 'windows'
Browse files Browse the repository at this point in the history
  • Loading branch information
wellcomez committed Nov 8, 2024
2 parents 17d57d9 + a1ce4a7 commit 161dde6
Show file tree
Hide file tree
Showing 82 changed files with 16,432 additions and 26 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ replace github.com/tree-sitter/tree-sitter-markdown => ./pkg/tree-sitter-markdow
replace github.com/tree-sitter-grammars/tree-sitter-yaml => ./pkg/tree-sitter-yaml/bindings/go

replace github.com/tree-sitter-grammars/tree-sitter-toml => ./pkg/tree-sitter-toml/bindings/go

replace github.com/creack/pty => ./pkg/photostorm/pty
require (
github.com/charlievieth/fastwalk v1.0.8
github.com/reinhrst/fzf-lib v0.9.0
Expand Down
54 changes: 54 additions & 0 deletions pkg/photostorm/pty/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
root = true

# Sane defaults.
[*]
# Always use unix end of line.
end_of_line = lf
# Always insert a new line at the end of files.
insert_final_newline = true
# Don't leave trailing whitespaces.
trim_trailing_whitespace = true
# Default to utf8 encoding.
charset = utf-8
# Space > tab for consistent aligns.
indent_style = space
# Default to 2 spaces for indent/tabs.
indent_size = 2
# Flag long lines.
max_line_length = 140

# Explicitly define settings for commonly used files.

[*.go]
indent_style = tab
indent_size = 8

[*.feature]
indent_style = space
indent_size = 2

[*.json]
indent_style = space
indent_size = 2

[*.{yml,yaml}]
indent_style = space
indent_size = 2

[*.tf]
indent_style = space
indent_size = 2

[*.md]
# Don't check line lenghts in files.
max_line_length = 0

[{Makefile,*.mk}]
indent_style = tab
indent_size = 8

[{Dockerfile,Dockerfile.*}]
indent_size = 4

[*.sql]
indent_size = 2
19 changes: 19 additions & 0 deletions pkg/photostorm/pty/.github/workflows/crosscompile.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: Crosscompile

"on":
push:
branches:
- master

jobs:
test:
name: Run ./test_crosscompile.sh
runs-on: ubuntu-latest

steps:
- name: Checkout repo
uses: actions/checkout@v4

- name: Run ./test_crosscompile.sh
run: ./test_crosscompile.sh
55 changes: 55 additions & 0 deletions pkg/photostorm/pty/.github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
---
name: Test

"on":
push:
branches:
- master
pull_request:
branches:
- master

jobs:
test:
name: "Test go ${{ matrix.go_version }} on ${{ matrix.platform }}"
runs-on: ${{ matrix.platform }}

strategy:
matrix:
platform:
- ubuntu-latest
- macos-latest
go_version:
# Test the two currently supported releases.
# (https://go.dev/doc/devel/release#policy).
- stable
- oldstable
include:
# Also sanity test a very old release on linux.
- platform: ubuntu-latest
go_version: 1.6.x

steps:
# 1.6 doesn't seem to default GOPATH to anything,
# so we set it explicitly here.
- if: ${{ matrix.go_version == '1.6.x' }}
name: Set GOPATH
run: echo "GOPATH=$HOME/go" >> $GITHUB_ENV

- name: Set up Go ${{ matrix.go_version }}
uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go_version }}
check-latest: true

- name: Checkout repo
uses: actions/checkout@v4

- name: Build
run: go build -v

# Skip tests for 1.6 as we use modern Go.
# If the main lib builds and tests pass on other versions, we are good.
- if: ${{ matrix.go_version != '1.6.x' }}
name: Test
run: go test -v
4 changes: 4 additions & 0 deletions pkg/photostorm/pty/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[568].out
_go*
_test*
_obj
Loading

0 comments on commit 161dde6

Please sign in to comment.