Skip to content

Commit

Permalink
LSP(Language Server Protocol) support (#2)
Browse files Browse the repository at this point in the history
* WIP

* wip

* wip

* rustfmt, gitignore idea

* completion insert_text

* typo

* wip

* docs, etc

* tmp

* Incremental update parse tree using ropey

* hover done

* ci, rust-toolchain, fmt

* rust-toolchain minimal, with rustfmt clippy

* Set component

* apply fmt

* rename server ci

* Make dual license

* wip

* cargo workspace, xtask

* xtask wip

* workflow test

* pnpm package_json_file

* lock path

* remove tree-sitter from client dependencies

node-gyp is not installed when using pnpm, and I think I don't need
tree-sitter in client code.

* pnpm set version, no from frozen lock file

* update lockfile

* Add `activationEvents`

* pnpm update

* vscode 1.78

* pnpm dlx

* pnpm vsce package ... --no-dependencies

* cleanup vscode client setup

* `onLanguage` can be removed?

* Looks like -- not needed in pnpm

* path?

* problemMatcher rustc

* dist, add `--no-dependencies` on vsce execution

In pnpm, it is needed

* clang

* add tar, set target as env

* fail-fast false

* another clang, dist gz/zip, bundle server

* add libc6-dev

* libc6-dev -> gcc-multilib ?

* version

* vscode path

* lint

* lint, refactor duplicate code

* clippy

* clippy

* allow dead code in document module

* clients wip

* textMate

* organize code bit, etc

* Add input - docker events

* Add input - dummy, elasticsearch, exec-wasi, exec, fluentbit-metrics,
forward, head

* Add input - health

* Add input - http

* wip

* add input/kubernetes-events

* Add inputs/memory-metrics, mqtt

* wip

* codegen, etc..

* clippy (need to deal with genearted code later)

* imports

* prepare to release
  • Loading branch information
sh-cho authored Aug 22, 2024
1 parent 7f44daf commit 64628d2
Show file tree
Hide file tree
Showing 168 changed files with 22,986 additions and 314 deletions.
5 changes: 5 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[alias]
xtask = "run --package xtask --"

[target.x86_64-pc-windows-msvc]
linker = "rust-lld"
39 changes: 0 additions & 39 deletions .github/release-drafter.yml

This file was deleted.

18 changes: 0 additions & 18 deletions .github/workflows/publish.yml

This file was deleted.

32 changes: 0 additions & 32 deletions .github/workflows/release-drafter.yml

This file was deleted.

258 changes: 258 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,258 @@
# https://github.com/rust-lang/rust-analyzer/blob/aa00ddcf654a35ba0eafe17247cf189958d33182/.github/workflows/release.yaml

name: Release
on:
workflow_dispatch:

# temp
# push:
# branches:
# - lsp

env:
CARGO_INCREMENTAL: 0
CARGO_NET_RETRY: 10
RUSTUP_MAX_RETRIES: 10
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc
# should match with version in dist.rs
VERSION_STABLE: 0.2

# for git tagging
permissions:
contents: write

jobs:
dist:
strategy:
fail-fast: false
matrix:
include:
- os: windows-latest
target: x86_64-pc-windows-msvc
code-target: win32-x64
- os: windows-latest
target: i686-pc-windows-msvc
- os: windows-latest
target: aarch64-pc-windows-msvc
code-target: win32-arm64
- os: ubuntu-20.04
target: x86_64-unknown-linux-gnu
code-target: linux-x64
container: rockylinux:8
- os: ubuntu-20.04
target: aarch64-unknown-linux-gnu
code-target: linux-arm64
- os: ubuntu-20.04
target: arm-unknown-linux-gnueabihf
code-target: linux-armhf
- os: macos-12
target: x86_64-apple-darwin
code-target: darwin-x64
- os: macos-12
target: aarch64-apple-darwin
code-target: darwin-arm64

runs-on: ${{ matrix.os }}
name: dist (${{ matrix.target }})
container: ${{ matrix.container }}

env:
FLB_LS_TARGET: ${{ matrix.target }}

steps:
- uses: actions/checkout@v4
- name: Install toolchain dependencies
if: matrix.container == 'rockylinux:8'
shell: bash
run: |
dnf install -y clang
curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL "https://sh.rustup.rs" | sh -s -- --profile minimal --default-toolchain none -y
echo "${CARGO_HOME:-$HOME/.cargo}/bin" >> $GITHUB_PATH
- name: Install Rust toolchain
run: |
rustup update --no-self-update stable
rustup target add ${{ matrix.target }}
rustup component add rust-src
- name: Update apt repositories
if: matrix.target == 'aarch64-unknown-linux-gnu' || matrix.target == 'arm-unknown-linux-gnueabihf'
run: |
sudo apt-get update
sudo apt-get install clang gcc-multilib
- name: Install AArch64 target toolchain
if: matrix.target == 'aarch64-unknown-linux-gnu'
run: sudo apt-get install gcc-aarch64-linux-gnu

- name: Install ARM target toolchain
if: matrix.target == 'arm-unknown-linux-gnueabihf'
run: sudo apt-get install gcc-arm-linux-gnueabihf

- name: Dist
run: cargo xtask dist --client-patch-version ${{ github.run_number }}

- uses: pnpm/action-setup@v4
with:
package_json_file: clients/vscode/package.json
run_install: false

- uses: actions/setup-node@v4
with:
node-version: 20
cache: 'pnpm'
cache-dependency-path: clients/vscode/pnpm-lock.yaml

- run: pnpm install
working-directory: clients/vscode

- name: Package Extension
if: matrix.code-target
run: pnpm dlx vsce package -o "../../dist/vscode-fluent-bit-${{ matrix.code-target }}.vsix" --target ${{ matrix.code-target }} --no-dependencies
working-directory: clients/vscode

# XXX: I don't think no-server version is needed for now.

- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: dist-${{ matrix.target }}
path: ./dist

dist-x86_64-unknown-linux-musl:
name: dist (x86_64-unknown-linux-musl)
runs-on: ubuntu-latest
env:
FLB_LS_TARGET: x86_64-unknown-linux-musl
# For some reason `-crt-static` is not working for clang without lld
RUSTFLAGS: "-C link-arg=-fuse-ld=lld -C target-feature=-crt-static"
container:
image: rust:alpine
volumes:
- /usr/local/cargo/registry:/usr/local/cargo/registry

steps:
- name: Install dependencies
run: apk add --no-cache git clang lld musl-dev nodejs npm tar

- uses: actions/checkout@v4

- name: Dist
run: cargo xtask dist --client-patch-version ${{ github.run_number }}

- uses: pnpm/action-setup@v4
with:
package_json_file: clients/vscode/package.json
run_install: false

- uses: actions/setup-node@v4
with:
node-version: 20
cache: 'pnpm'
cache-dependency-path: clients/vscode/pnpm-lock.yaml

- run: pnpm install
working-directory: clients/vscode

- name: Package Extension
run: pnpm dlx vsce package -o "../../dist/vscode-fluent-bit-alpine-x64.vsix" --target alpine-x64 --no-dependencies
working-directory: clients/vscode

- run: rm -rf clients/vscode/server

- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: dist-x86_64-unknown-linux-musl
path: ./dist

publish:
name: publish
runs-on: ubuntu-latest
needs: [ "dist", "dist-x86_64-unknown-linux-musl" ]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20

- run: echo "TAG=${{ env.VERSION_STABLE }}.${{ github.run_number }}" >> $GITHUB_ENV
- run: 'echo "TAG: $TAG"'

- uses: actions/download-artifact@v4
with:
name: dist-aarch64-apple-darwin
path: dist
- uses: actions/download-artifact@v4
with:
name: dist-x86_64-apple-darwin
path: dist
- uses: actions/download-artifact@v4
with:
name: dist-x86_64-unknown-linux-gnu
path: dist
- uses: actions/download-artifact@v4
with:
name: dist-x86_64-unknown-linux-musl
path: dist
- uses: actions/download-artifact@v4
with:
name: dist-aarch64-unknown-linux-gnu
path: dist
- uses: actions/download-artifact@v4
with:
name: dist-arm-unknown-linux-gnueabihf
path: dist
- uses: actions/download-artifact@v4
with:
name: dist-x86_64-pc-windows-msvc
path: dist
- uses: actions/download-artifact@v4
with:
name: dist-i686-pc-windows-msvc
path: dist
- uses: actions/download-artifact@v4
with:
name: dist-aarch64-pc-windows-msvc
path: dist

- run: ls -al ./dist

- name: git tag and push
run: |
git config user.name 'github-actions[bot]'
git config user.email 'github-actions[bot]@users.noreply.github.com'
git tag -a $TAG -m "Release $TAG"
git push origin $TAG
- name: Publish release
uses: softprops/action-gh-release@v2
with:
name: ${{ env.TAG }}
tag_name: ${{ env.TAG }}
files: |
dist/*
- uses: pnpm/action-setup@v4
with:
package_json_file: clients/vscode/package.json
run_install: false

- uses: actions/setup-node@v4
with:
node-version: 20
cache: 'pnpm'
cache-dependency-path: clients/vscode/pnpm-lock.yaml

- run: pnpm install
working-directory: clients/vscode

- name: Publish Extension (Code Marketplace)
run: pnpm dlx vsce publish --pat ${{ secrets.VSCE_TOKEN }} --packagePath ../../dist/vscode-fluent-bit-*.vsix
working-directory: clients/vscode

- name: Publish Extension (OpenVSX)
run: pnpm dlx ovsx publish --pat ${{ secrets.OVSX_TOKEN }} --packagePath ../../dist/vscode-fluent-bit-*.vsix
working-directory: clients/vscode
timeout-minutes: 2
24 changes: 24 additions & 0 deletions .github/workflows/server-ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Server CI

on: [ push, pull_request ]

jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@nightly
with:
components: rustfmt, clippy
- name: style
run: cargo +nightly fmt -- --check
- name: clippy
run: cargo clippy --all-targets --all-features -- -D warnings

test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- name: test
run: cargo test --all-targets --all-features
Loading

0 comments on commit 64628d2

Please sign in to comment.