From 4e13ade14d217a6634c7f5c14daf3ab3b5296510 Mon Sep 17 00:00:00 2001 From: "Mirjana Stojanoska (c)" Date: Thu, 25 Apr 2024 12:19:13 +0200 Subject: [PATCH 1/7] fixed hinting for folder name with dash in it Signed-off-by: Mirjana Stojanoska (c) --- .../src/server/feature/CompletionProvider.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node/vro-language-server/src/server/feature/CompletionProvider.ts b/packages/node/vro-language-server/src/server/feature/CompletionProvider.ts index 6da5d3eb..02875944 100644 --- a/packages/node/vro-language-server/src/server/feature/CompletionProvider.ts +++ b/packages/node/vro-language-server/src/server/feature/CompletionProvider.ts @@ -47,7 +47,7 @@ class CompletionPrefixPattern { const prefixPatterns = [ new CompletionPrefixPattern( CompletionPrefixKind.MODULE_IMPORT, - /System\.getModule\s*\(["']((?:[a-zA-Z_$][\w$]*\.)*)([a-zA-Z_$]?[\w$]*)$/, // https://regex101.com/r/bsVfwk/1 + /System\.getModule\s*\(["']((?:[a-zA-Z_$][-\w$]*\.)*)([a-zA-Z_$]?[\w$]*)$/, // https://regex101.com/r/WKCK3Y/1 /Class\.load\s*\(["']((?:[a-zA-Z_$][\w$]*\.)*)([a-zA-Z_$]?[\w$]*)$/ // https://regex101.com/r/90B9Db/1 ), From 0c1a019625ec3ea9946a927736d33c72cd8aefbc Mon Sep 17 00:00:00 2001 From: Alexander Kantchev <125263901+akantchev@users.noreply.github.com> Date: Thu, 25 Apr 2024 16:41:55 +0300 Subject: [PATCH 2/7] Update build.yml Remove the node version 14.x (as it is obsolete) --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 389f2159..83351b32 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - node-version: [14.x, 16.x] + node-version: [16.x] os: [ubuntu-latest, macOS-latest, windows-latest] runs-on: ${{ matrix.os }} env: From ef2d79c09505dbb4c342f01f5de4c18d837a853f Mon Sep 17 00:00:00 2001 From: Alexander Kantchev Date: Thu, 25 Apr 2024 16:48:42 +0300 Subject: [PATCH 3/7] [Task N/A] Removed temporary the macOS-latest from the build matrix Signed-off-by: Alexander Kantchev --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 83351b32..bca5d577 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: node-version: [16.x] - os: [ubuntu-latest, macOS-latest, windows-latest] + os: [ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} env: CI: true From aff5c98566ff16efc486abb81dcdc3e7e9d58cd1 Mon Sep 17 00:00:00 2001 From: Alexander Kantchev Date: Wed, 29 May 2024 14:52:28 +0300 Subject: [PATCH 4/7] [Task N/A] Updated build file. Signed-off-by: Alexander Kantchev --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bca5d577..389f2159 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,8 +15,8 @@ jobs: strategy: fail-fast: false matrix: - node-version: [16.x] - os: [ubuntu-latest, windows-latest] + node-version: [14.x, 16.x] + os: [ubuntu-latest, macOS-latest, windows-latest] runs-on: ${{ matrix.os }} env: CI: true From b60e09ee1f12b3669c060ce5caf65a4f0c05260d Mon Sep 17 00:00:00 2001 From: Alexander Kantchev Date: Thu, 30 May 2024 12:09:58 +0300 Subject: [PATCH 5/7] [Task N/A] Updated build file. Signed-off-by: Alexander Kantchev --- .github/workflows/build.yml | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 389f2159..ed3ed0a8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,17 +15,12 @@ jobs: strategy: fail-fast: false matrix: - node-version: [14.x, 16.x] - os: [ubuntu-latest, macOS-latest, windows-latest] + node-version: [19.6.0] + os: [ubuntu-latest] runs-on: ${{ matrix.os }} env: CI: true steps: - # - name: Set git config - # if: runner.os == 'Windows' - # shell: bash - # run: git config --global core.autocrlf true - - uses: actions/checkout@v2 - name: echo github.ref @@ -36,12 +31,12 @@ jobs: with: node-version: ${{ matrix.node-version }} - - name: Use NPM 8 + - name: Install NPM 8 run: npm install -g npm@8.3.1 # lock to 8.3.1 until actions/setup-node#411 and npm/cli#4341 are fixed - name: Set version number of package.json and build artifact id: version_step - if: runner.os == 'macOS' + if: runner.os == 'ubuntu-latest' env: RUN_NUMBER: ${{ github.run_number }} run: | @@ -76,17 +71,13 @@ jobs: - name: Install dependencies run: "npm ci" - - name: Lint, compile and test - run: "node node_modules/gulp/bin/gulp.js lint test" - if: runner.os != 'macOS' - - name: Lint, compile, test and package run: "node node_modules/gulp/bin/gulp.js package" - if: runner.os == 'macOS' + if: runner.os == 'ubuntu-latest' - name: Publish code coverage report uses: codecov/codecov-action@v1 - if: runner.os == 'macOS' + if: runner.os == 'ubuntu-latest' with: token: ${{ secrets.CODECOV_TOKEN }} file: "**/coverage/*.json" @@ -95,7 +86,7 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v2 - if: runner.os == 'macOS' + if: runner.os == 'ubuntu-latest' with: name: vrealize-developer-tools-${{steps.version_step.outputs.version_build}}.vsix path: "*.vsix" From 0fc6ec4e5025ce9395c1edf4ed7f0da812fc0e2a Mon Sep 17 00:00:00 2001 From: Alexander Kantchev Date: Thu, 30 May 2024 12:15:30 +0300 Subject: [PATCH 6/7] [Task N/A] Updated build file. Signed-off-by: Alexander Kantchev --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed3ed0a8..f0eb6361 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,8 +31,8 @@ jobs: with: node-version: ${{ matrix.node-version }} - - name: Install NPM 8 - run: npm install -g npm@8.3.1 # lock to 8.3.1 until actions/setup-node#411 and npm/cli#4341 are fixed + - name: Install NPM 9.4.0 + run: npm install -g npm@9.4.0 # lock to 9.4.0 until actions/setup-node#411 and npm/cli#4341 are fixed - name: Set version number of package.json and build artifact id: version_step From 99888f9337685702785a52b9ee9903d8f1cab1e2 Mon Sep 17 00:00:00 2001 From: Alexander Kantchev Date: Thu, 30 May 2024 17:44:28 +0300 Subject: [PATCH 7/7] [Task N/A] Updated build file. Signed-off-by: Alexander Kantchev --- .github/workflows/draft-release.yml | 10 +++++----- .github/workflows/publish.yml | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 89c2e906..db8e5ac8 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -6,7 +6,7 @@ on: jobs: build_release: name: Build and Release - runs-on: macos-latest + runs-on: ubuntu-latest env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: @@ -17,13 +17,13 @@ jobs: - name: echo github.ref run: echo ${{ github.ref }} - - name: Use Node.js 16.x + - name: Use Node.js 19.6.0 uses: actions/setup-node@v2 with: - node-version: 16.x + node-version: 19.6.0 - - name: Use NPM 8 - run: npm install -g npm@8.3.1 # lock to 8.3.1 until actions/setup-node#411 and npm/cli#4341 are fixed + - name: Use NPM 9.4.0 + run: npm install -g npm@9.4.0 # lock to 9.4.0 until actions/setup-node#411 and npm/cli#4341 are fixed - name: Install sha256sum and minisign run: | diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7fe9e17a..15083d88 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -5,12 +5,12 @@ on: jobs: publish: name: Publish to Visual Studio Marketplace and GitHub Packages - runs-on: macos-latest + runs-on: ubuntu-latest steps: - - name: Use Node.js 16.x + - name: Use Node.js 19.6.0 uses: actions/setup-node@v2 with: - node-version: 16.x + node-version: 19.6.0 - name: Install vsce run: npm install -g vsce