Skip to content

Commit 2874935

Browse files
Drop buf-bin-setup from CI
We don't need this matrix after removing the test; we'll just always install the `buf` CLI. Also renames the file to `ci.yaml` to match the intent and job name.
1 parent 65b58d8 commit 2874935

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed
Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ jobs:
99
- macos-latest
1010
- ubuntu-latest
1111
- windows-latest
12-
buf-bin-setup:
13-
# these strings are referenced in the tests
14-
- buf-on-path
15-
- buf-not-on-path
1612
runs-on: ${{ matrix.os }}
1713
steps:
1814
- name: checkout
@@ -23,7 +19,6 @@ jobs:
2319
node-version-file: ".nvmrc"
2420
cache: npm
2521
- uses: bufbuild/buf-action@v1
26-
if: matrix.buf-bin-setup == 'buf-on-path'
2722
with:
2823
setup_only: true
2924
- name: install-deps
@@ -38,33 +33,27 @@ jobs:
3833
run: npm run format
3934
- name: integration-tests-with-xvfb
4035
env:
41-
BUF_INSTALLED: ${{ matrix.buf-bin-setup }}
4236
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4337
run: xvfb-run -a npm run test:integration
4438
if: runner.os == 'Linux'
4539
- name: integration-tests
4640
shell: bash
4741
env:
48-
BUF_INSTALLED: ${{ matrix.buf-bin-setup }}
4942
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5043
run: npm run test:integration
5144
if: runner.os != 'Linux'
5245
- name: playwright-tests
5346
run: npm run test:playwright
5447
# Limiting playwright tests to macOS for now due to issues with xvfb on Linux and
5548
# timeouts on windows
56-
#
57-
# NOTE: We disable playwright tests when buf is not installed on the system $PATH
58-
# for now so we don't have the extension attempting to resolve the installation.
59-
# We'll need to find a way to intercept the call from playwright's VS Code extension.
60-
if: runner.os == 'macOS' && matrix.buf-bin-setup == 'buf-on-path'
49+
if: runner.os == 'macOS'
6150
- name: check diff
6251
run: node scripts/gh-diffcheck.mjs
6352
- name: upload-playwright-test-results
6453
uses: actions/upload-artifact@v6
6554
if: always()
6655
with:
67-
name: test-results-${{ matrix.buf-bin-setup }}
56+
name: test-results
6857
path: test-results/
6958
retention-days: 5
7059
if-no-files-found: ignore

0 commit comments

Comments
 (0)