Skip to content

Commit

Permalink
Merge branch 'main' into ni/merge-main-into-copilot
Browse files Browse the repository at this point in the history
* main:
  chore(ci): Update deprecated github actions (#813)
  Update changelog (#802)
  Update changelog (#801)
  fix: cannot find module electron VSCODE-598 (#799)
  Update changelog (#797)
  Update changelog (#796)
  fix: clean-up webpack config VSCODE-597 (#795)
  fix(deps): bump shell and data-service deps VSCODE-564 (#794)
  fix(editors): don't show connect code lens on regular js files VSCODE-538 (#789)
  fix: add telemetry events for survey VSCODE-595 (#787)
  feat: show survey VSCODE-562 (#780)
  chore(testing): use source map support, improve test cleanup error handling VSCODE-593 (#784)
  • Loading branch information
nirinchev committed Sep 10, 2024
2 parents ab9d5b7 + a7dbbb1 commit e9f280c
Show file tree
Hide file tree
Showing 7 changed files with 117 additions and 100 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/actions/test-and-build/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ runs:
# Default Python (3.12) doesn't have support for distutils because of
# which the dep install fails constantly on macos
# https://github.com/nodejs/node-gyp/issues/2869
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.11'

Expand Down Expand Up @@ -107,7 +107,7 @@ runs:
shell: bash

- name: Upload artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: VSIX built on ${{ runner.os }}
path: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -66,7 +66,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -79,6 +79,6 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
4 changes: 2 additions & 2 deletions .github/workflows/draft-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# NOTE: this is necessary to get the full history
# and check if tags are already present
fetch-depth: 0

- name: Setup Node.js Environment
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20.16.0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Setup Node.js Environment
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20.16.0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rebuild-changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
name: Rebuild changelog
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# don't checkout a detached HEAD, is important to have a real base
# branch when creating a PR
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-and-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup Node.js Environment
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20.16.0

Expand Down
193 changes: 105 additions & 88 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e9f280c

Please sign in to comment.