Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .github/actions/build-vscode-extension/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ outputs:
runs:
using: 'composite'
steps:
- uses: actions/setup-node@v4
- uses: actions/setup-python@v6
with:
python-version: "3.11"

- uses: actions/setup-node@v6
with:
node-version-file: ".nvmrc"

Expand Down Expand Up @@ -147,6 +151,11 @@ runs:
# Verify the change
echo "✅ New version: $(node -p "require('./package.json').version")"

- name: Setup packaging runtime
uses: actions/setup-node@v6
with:
node-version: 24

- name: Package extension (build artifacts)
shell: bash
env:
Expand Down
13 changes: 12 additions & 1 deletion .github/actions/run-jetbrains-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ runs:
- name: Setup FFmpeg
uses: AnimMouse/setup-ffmpeg@v1
with:
version: 7.1
version: 8.1
token: ${{ inputs.github-token }}

- name: Setup Gradle
Expand Down Expand Up @@ -88,6 +88,11 @@ runs:
# https://github.com/microsoft/vscode-ripgrep/issues/9#issuecomment-643965333
GITHUB_TOKEN: ${{ inputs.ci-github-token }}

- name: Setup binary packager runtime
uses: actions/setup-node@v6
with:
node-version: 22

- uses: actions/cache@v4
id: binary-cache
with:
Expand All @@ -107,6 +112,12 @@ runs:
cd binary
npm run build

- name: Test the packaged binary
shell: bash
run: |
cd binary
npm test -- --runInBand

- name: Run tests
shell: bash
run: |
Expand Down
8 changes: 7 additions & 1 deletion .github/actions/setup-component/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ runs:
shell: bash
run: npm ci

- name: Setup binary packager runtime
if: inputs.component == 'binary'
uses: actions/setup-node@v6
with:
node-version: 22

- uses: actions/cache@v4
id: component-cache
with:
Expand All @@ -54,4 +60,4 @@ runs:
shell: bash
run: |
cd ${{ inputs.component == 'vscode' && 'extensions/vscode' || inputs.component }}
npm ci
npm ci
10 changes: 10 additions & 0 deletions .github/workflows/jetbrains-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,11 @@ jobs:
# https://github.com/microsoft/vscode-ripgrep/issues/9#issuecomment-643965333
GITHUB_TOKEN: ${{ secrets.CI_GITHUB_TOKEN }}

- name: Setup binary packager runtime
uses: actions/setup-node@v6
with:
node-version: 22

# npm install binary
- name: Install binary node_modules
run: |
Expand Down Expand Up @@ -391,6 +396,11 @@ jobs:
cd ../../core
npm ci

- name: Setup binary packager runtime
uses: actions/setup-node@v6
with:
node-version: 22

- name: Install Binary Dependencies
run: |
cd ../../binary
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-build-upload-vsix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
build-and-upload-vsix:
runs-on: ${{ matrix.runner }}
timeout-minutes: 10
timeout-minutes: 20
strategy:
matrix:
include:
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/pr-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ on:
branches:
- main

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
track-rerun:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -105,7 +108,7 @@ jobs:
component: gui
include-packages: false
env:
GITHUB_TOKEN: ${{ secrets.CI_GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.CI_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}

- name: Type check and lint
run: |
Expand Down Expand Up @@ -157,7 +160,7 @@ jobs:
component: vscode
include-packages: false
env:
GITHUB_TOKEN: ${{ secrets.CI_GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.CI_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}

- name: Type check and lint
run: |
Expand Down Expand Up @@ -278,7 +281,7 @@ jobs:
echo "EOF" >> $GITHUB_OUTPUT
env:
# https://github.com/microsoft/vscode-ripgrep/issues/9#issuecomment-643965333
GITHUB_TOKEN: ${{ secrets.CI_GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.CI_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}

- name: Debug Outputs
run: |
Expand Down Expand Up @@ -329,7 +332,7 @@ jobs:
ssh_key: ${{ secrets.GH_ACTIONS_SSH_TEST_KEY_PEM }}
ssh_host: ${{ secrets.GH_ACTIONS_SSH_TEST_DNS_NAME }}
is_fork: ${{ github.event.pull_request.head.repo.fork == true || github.actor == 'dependabot[bot]' }}
github_token: ${{ secrets.CI_GITHUB_TOKEN }}
github_token: ${{ secrets.CI_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}

jetbrains-tests:
runs-on: ubuntu-latest
Expand All @@ -351,7 +354,7 @@ jobs:
uses: ./.github/actions/run-jetbrains-tests
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
ci-github-token: ${{ secrets.CI_GITHUB_TOKEN }}
ci-github-token: ${{ secrets.CI_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}

# GitHub does not have a way of requiring that all checks pass (you must manually select each job)
# This action at least lets us manage the list of required tests via source control
Expand Down
Loading
Loading