From 43ab6999a785a3c201f9c2bc7404f89691f48f21 Mon Sep 17 00:00:00 2001 From: Theodor Kvalsvik Lauritzen Date: Thu, 8 Aug 2024 14:48:24 +0200 Subject: [PATCH 1/2] chore: Add environment variables to gh action, and add PR stage to bump version --- .github/workflows/lspDeploy.yml | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lspDeploy.yml b/.github/workflows/lspDeploy.yml index 31ce3df4a7d0..74e4c4440b14 100644 --- a/.github/workflows/lspDeploy.yml +++ b/.github/workflows/lspDeploy.yml @@ -18,10 +18,9 @@ on: jobs: lspDeploy: + name: Vespa Schema LSP Deployment Job runs-on: ubuntu-latest - defaults: - run: - working-directory: ./integration/schema-language-server/clients/vscode + steps: - uses: actions/checkout@v4 - name: Set up JDK 17 @@ -44,6 +43,30 @@ jobs: - name: Download node dependencies run: npm ci + working-directory: ./integration/schema-language-server/clients/vscode - - name: Publish + - name: Publish VScode extension run: npm run publish + working-directory: ./integration/schema-language-server/clients/vscode + env: + VSCE_PAT: ${{ secrets.VSCE_PAT }} + + - name: Publish Intellij plugin + run: gradle publishPlugin + working-directory: ./integration/schema-language-server/clients/intellij + env: + CERTIFICATE_CHAIN: ${{ secrets.INTELLIJ_CERTIFICATE_CHAIN }} + PRIVATE_KEY: ${{ secrets.INTELLIJ_PRIVATE_KEY }} + PRIVATE_KEY_PASSWORD: ${{ secrets.INTELLIJ_PRIVATE_KEY_PASSWORD }} + PUBLISH_TOKEN: ${{ secrets.INTELLIJ_PUBLISH_TOKEN }} + + - name: Create PR to bump version + uses: peter-evans/create-pull-request@v6 + with: + token: ${{ secrets.GITHUB_TOKEN }} + commit-message: "Update Vespa Language Server VSCode extension version" + title: "Bump Vespa Language Server version" + body: "This PR updates the Vespa Language Server VSCode extension" + branch: "interns/languageserver-bump-version" + base: "master" + labels: "Language server" From 5da643978a0c54ccf138a1ceb238fcbb4e84f0c8 Mon Sep 17 00:00:00 2001 From: Theodor Kvalsvik Lauritzen Date: Thu, 8 Aug 2024 14:49:20 +0200 Subject: [PATCH 2/2] chore: comment the publication of intellij plugin --- .github/workflows/lspDeploy.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/lspDeploy.yml b/.github/workflows/lspDeploy.yml index 74e4c4440b14..f3a27d5f1100 100644 --- a/.github/workflows/lspDeploy.yml +++ b/.github/workflows/lspDeploy.yml @@ -51,14 +51,14 @@ jobs: env: VSCE_PAT: ${{ secrets.VSCE_PAT }} - - name: Publish Intellij plugin - run: gradle publishPlugin - working-directory: ./integration/schema-language-server/clients/intellij - env: - CERTIFICATE_CHAIN: ${{ secrets.INTELLIJ_CERTIFICATE_CHAIN }} - PRIVATE_KEY: ${{ secrets.INTELLIJ_PRIVATE_KEY }} - PRIVATE_KEY_PASSWORD: ${{ secrets.INTELLIJ_PRIVATE_KEY_PASSWORD }} - PUBLISH_TOKEN: ${{ secrets.INTELLIJ_PUBLISH_TOKEN }} + # - name: Publish Intellij plugin + # run: gradle publishPlugin + # working-directory: ./integration/schema-language-server/clients/intellij + # env: + # CERTIFICATE_CHAIN: ${{ secrets.INTELLIJ_CERTIFICATE_CHAIN }} + # PRIVATE_KEY: ${{ secrets.INTELLIJ_PRIVATE_KEY }} + # PRIVATE_KEY_PASSWORD: ${{ secrets.INTELLIJ_PRIVATE_KEY_PASSWORD }} + # PUBLISH_TOKEN: ${{ secrets.INTELLIJ_PUBLISH_TOKEN }} - name: Create PR to bump version uses: peter-evans/create-pull-request@v6