From c7891b867ad4f46bc10bdd0e91f34d1d7032664d Mon Sep 17 00:00:00 2001 From: smallstone <> Date: Tue, 12 Dec 2023 16:01:56 +0800 Subject: [PATCH 1/4] Update user authentication logic --- .gitmodules | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..a73dcf8 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "gui"] + path = gui + url = git@github.com:devchat-ai/devchat-gui.git From 5c3dc5427d2d28fb962151a9e9c8fdd1099ef2bf Mon Sep 17 00:00:00 2001 From: smallstone <> Date: Wed, 13 Dec 2023 12:48:48 +0800 Subject: [PATCH 2/4] feat: update package --- .gitmodules | 2 +- gui | 1 + package.json | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 160000 gui create mode 100644 package.json diff --git a/.gitmodules b/.gitmodules index a73dcf8..b93b3f1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "gui"] path = gui - url = git@github.com:devchat-ai/devchat-gui.git + url = https://github.com/devchat-ai/devchat-gui.git diff --git a/gui b/gui new file mode 160000 index 0000000..18ecef9 --- /dev/null +++ b/gui @@ -0,0 +1 @@ +Subproject commit 18ecef9e69b79686340df1552e882a8d4946dcfa diff --git a/package.json b/package.json new file mode 100644 index 0000000..754e2d1 --- /dev/null +++ b/package.json @@ -0,0 +1,6 @@ +{ + "name": "devchat-intellij", + "scripts": { + "build": "cd ./gui && yarn && yarn idea" + } +} From 95d6ea6a2f680f8e92b15dd674890f90eae18c17 Mon Sep 17 00:00:00 2001 From: smallstone <> Date: Wed, 13 Dec 2023 13:27:57 +0800 Subject: [PATCH 3/4] feat: update gui --- gui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui b/gui index 18ecef9..a39ec87 160000 --- a/gui +++ b/gui @@ -1 +1 @@ -Subproject commit 18ecef9e69b79686340df1552e882a8d4946dcfa +Subproject commit a39ec87f9aa38560c538e69ffdb0290baa720a13 From e87b933676646a105defd80f35ab5f94fddd2542 Mon Sep 17 00:00:00 2001 From: Luo Tim <shiwen@merico.dev> Date: Thu, 14 Dec 2023 16:12:10 +0800 Subject: [PATCH 4/4] Improve CI to build GUI from submodule --- .github/workflows/build.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f41f331..90a5c2e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,19 +26,29 @@ jobs: build: name: Build runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [14.x] + outputs: version: ${{ steps.properties.outputs.version }} changelog: ${{ steps.properties.outputs.changelog }} pluginVerifierHomeDir: ${{ steps.properties.outputs.pluginVerifierHomeDir }} - steps: + steps: # Check out current repository - name: Fetch Sources uses: actions/checkout@v4 - - name: Get latest version of main.html and main.js - run: | - wget $(curl -s https://api.github.com/repositories/709076669/releases/latest | grep -oP '"browser_download_url": "\K(.*)(?=")' | grep main.html) -O src/main/resources/static/main.html - wget $(curl -s https://api.github.com/repositories/709076669/releases/latest | grep -oP '"browser_download_url": "\K(.*)(?=")' | grep main.js) -O src/main/resources/static/main.js + run: git submodule update --init --recursive + + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.node-version }} + + - name: Build GUI + run: cd gui && yarn && yarn idea # Validate wrapper - name: Gradle Wrapper Validation