From 817e6aa198e052ad3c9c75793b433447d0c27b04 Mon Sep 17 00:00:00 2001 From: oxyplay Date: Fri, 16 Feb 2024 08:39:42 +0000 Subject: [PATCH 1/8] ci/cl update --- .github/workflows/main.yml | 133 ++++++++++++++++++++++++++----------- 1 file changed, 94 insertions(+), 39 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 303bdc3..84919db 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,60 +1,115 @@ name: CI build on: - # Trigger the workflow on pushes to only the 'main' branch (this avoids duplicate checks being run e.g. for dependabot pull requests) push: branches: [main] - # Trigger the workflow on any pull request pull_request: workflow_dispatch: + inputs: + version: + description: 'Release version' + required: true jobs: - dist: - strategy: - matrix: - include: - - os: windows-latest - target: x86_64-pc-windows-msvc - code-target: win32-x64 - - 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 - - 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-11 - target: x86_64-apple-darwin - code-target: darwin-x64 - - os: macos-11 - target: aarch64-apple-darwin - code-target: darwin-arm64 - - env: - LLM_LS_TARGET: ${{ matrix.target }} - - name: dist (${{ matrix.target }}) - runs-on: ${{ matrix.os }} - container: ${{ matrix.container }} + # dist: + # strategy: + # matrix: + # include: + # - os: windows-latest + # target: x86_64-pc-windows-msvc + # code-target: win32-x64 + # - 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 + # - 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-11 + # target: x86_64-apple-darwin + # code-target: darwin-x64 + # - os: macos-11 + # target: aarch64-apple-darwin + # code-target: darwin-arm64 + + # env: + # LLM_LS_TARGET: ${{ matrix.target }} + + # name: dist (${{ matrix.target }}) + # runs-on: ${{ matrix.os }} + # container: ${{ matrix.container }} + + # steps: + # - name: Checkout repository + # uses: actions/checkout@v4 + # with: + # fetch-depth: ${{ env.FETCH_DEPTH }} + + # - name: Download artifact + # id: download-artifact + # uses: dawidd6/action-download-artifact@v3 + # with: + # github_token: ${{secrets.GITHUB_TOKEN}} + # workflow: build.yml + # workflow_conclusion: success + # repo: smallcloudai/refact-lsp + # branch: main + + release: + name: Download Artifact (Release) + runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: ${{ env.FETCH_DEPTH }} - name: Download artifact id: download-artifact - uses: dawidd6/action-download-artifact@v2 + uses: dawidd6/action-download-artifact@v3 with: github_token: ${{secrets.GITHUB_TOKEN}} workflow: build.yml + workflow_conclusion: success repo: smallcloudai/refact-lsp - branch: main - path: ./assets - name: dist-${{ matrix.target }} + branch: main + + - name: Create packages + run: | + mkdir original + mkdir artifacts + cp *.* original + cp -r src server original + + for platform_folder in ./dist*; do + if [[ -d $platform_folder ]]; then + platform_name=$(basename "$platform_folder") + + case $platform_name in + dist-aarch64-apple-darwin) group="osx-arm64" ;; + dist-x86_64-apple-darwin) group="osx-x64" ;; + dist-aarch64-unknown-linux-gnu|dist-aarch64-unknown-linux-musl) group="linux-arm64" ;; + dist-x86_64-unknown-linux-gnu|dist-x86_64-unknown-linux-musl) group="linux-x64" ;; + dist-x86_64-pc-windows-msvc) group="windows-x64" ;; + dist-aarch64-pc-windows-msvc) group="windows-arm64" ;; + dist-i686-pc-windows-msvc) group="windows-x86" ;; + *) echo "Unknown platform: $platform_name"; continue ;; + esac + + rm -f original/server/* + cp -r "$platform_folder"/* original/server + (cd original && zip -r -q "../artifacts/Refact-$group.sublime-package" *) + fi + done + + - name: Release + uses: ncipollo/release-action@v1 + with: + artifacts: "artifacts/Refact-*.sublime-package" + tag: ${{ github.event.inputs.version }} \ No newline at end of file From 060fc7f97a65d06672fa5d482aa5ae71148f5480 Mon Sep 17 00:00:00 2001 From: oxyplay Date: Wed, 21 Feb 2024 08:12:50 +0000 Subject: [PATCH 2/8] hidden files possible fix --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 84919db..c418570 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -82,6 +82,7 @@ jobs: - name: Create packages run: | + shopt -s dotglob mkdir original mkdir artifacts cp *.* original @@ -107,6 +108,7 @@ jobs: (cd original && zip -r -q "../artifacts/Refact-$group.sublime-package" *) fi done + shopt -u dotglob - name: Release uses: ncipollo/release-action@v1 From 82be763ac5a4165c05d7247671891b76f23adc97 Mon Sep 17 00:00:00 2001 From: oxyplay Date: Wed, 21 Feb 2024 08:17:37 +0000 Subject: [PATCH 3/8] copy fix test --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c418570..eaf582f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -82,10 +82,10 @@ jobs: - name: Create packages run: | - shopt -s dotglob mkdir original mkdir artifacts cp *.* original + cp .python-version /original cp -r src server original for platform_folder in ./dist*; do @@ -108,7 +108,6 @@ jobs: (cd original && zip -r -q "../artifacts/Refact-$group.sublime-package" *) fi done - shopt -u dotglob - name: Release uses: ncipollo/release-action@v1 From 689dea1a7120c9b2937d6aca3f6b18e31945d541 Mon Sep 17 00:00:00 2001 From: oxyplay Date: Wed, 21 Feb 2024 08:26:38 +0000 Subject: [PATCH 4/8] target fix --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eaf582f..ac23709 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -85,7 +85,7 @@ jobs: mkdir original mkdir artifacts cp *.* original - cp .python-version /original + cp .python-version original/ cp -r src server original for platform_folder in ./dist*; do From 155c9851b72b190109cc9e413870f550f83af1a4 Mon Sep 17 00:00:00 2001 From: oxyplay Date: Wed, 21 Feb 2024 08:33:49 +0000 Subject: [PATCH 5/8] hidden into zip test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ac23709..0a05589 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -105,7 +105,7 @@ jobs: rm -f original/server/* cp -r "$platform_folder"/* original/server - (cd original && zip -r -q "../artifacts/Refact-$group.sublime-package" *) + (cd original && zip -r -q "../artifacts/Refact-$group.sublime-package" * .*) fi done From 761180735d253feb79ca1d5d1f1a3f8e651d11d2 Mon Sep 17 00:00:00 2001 From: oxyplay Date: Wed, 21 Feb 2024 08:44:46 +0000 Subject: [PATCH 6/8] non hidden python --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0a05589..d602513 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -105,7 +105,7 @@ jobs: rm -f original/server/* cp -r "$platform_folder"/* original/server - (cd original && zip -r -q "../artifacts/Refact-$group.sublime-package" * .*) + (cd original && zip -r -q "../artifacts/Refact-$group.sublime-package" * .python-version) fi done From a0328f25e87b63d35ce4550bca1e14ca8a06c481 Mon Sep 17 00:00:00 2001 From: oxyplay Date: Wed, 21 Feb 2024 09:46:20 +0000 Subject: [PATCH 7/8] path test --- src/refact_process.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/refact_process.py b/src/refact_process.py index 14e121f..2e78cdb 100644 --- a/src/refact_process.py +++ b/src/refact_process.py @@ -5,6 +5,7 @@ import os from .refact_lsp import LSP from .statusbar import StatusBar +from os.path import dirname, realpath class RefactProcessWrapper(): def __init__(self): @@ -23,7 +24,8 @@ def process_server_errors(self): self.statusbar.update_statusbar("error", line) def get_server_path(self): - return os.path.join(sublime.packages_path(), "refact", "server", "refact-lsp") + current_dir = dirname(realpath(__file__)) + return os.path.join(sublime.packages_path(), current_dir, "server", "refact-lsp") def get_server_commands(self): s = sublime.load_settings("refact.sublime-settings") From 042bf8b3ddfa381bf553af6a0e9816e2f6b648c2 Mon Sep 17 00:00:00 2001 From: oxyplay Date: Wed, 21 Feb 2024 18:19:26 +0000 Subject: [PATCH 8/8] parent dir --- src/refact_process.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/refact_process.py b/src/refact_process.py index 2e78cdb..dff9b15 100644 --- a/src/refact_process.py +++ b/src/refact_process.py @@ -24,7 +24,7 @@ def process_server_errors(self): self.statusbar.update_statusbar("error", line) def get_server_path(self): - current_dir = dirname(realpath(__file__)) + current_dir = os.path.dirname(dirname(realpath(__file__))) return os.path.join(sublime.packages_path(), current_dir, "server", "refact-lsp") def get_server_commands(self):