Skip to content

Commit ae7197b

Browse files
authored
Merge branch 'main' into add_fabric_warehouse
2 parents 50fe5e4 + e07c5fe commit ae7197b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1943
-747
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ on_main_or_tag_filter: &on_main_or_tag_filter
77
branches:
88
only: main
99
tags:
10-
only: /^v.+/
10+
only: /^v\d+\.\d+\.\d+/
1111

1212
on_tag_filter: &on_tag_filter
1313
filters:
1414
branches:
1515
ignore: /.*/
1616
tags:
17-
only: /^v.+/
17+
only: /^v\d+\.\d+\.\d+/
1818

1919
orbs:
2020
path-filtering: circleci/[email protected]
@@ -39,7 +39,7 @@ jobs:
3939
command: unset TWINE_USERNAME TWINE_PASSWORD && make publish-tests
4040
gh-release:
4141
docker:
42-
- image: cimg/node:16.14
42+
- image: cimg/node:20.19.0
4343
resource_class: small
4444
steps:
4545
- run:
@@ -54,7 +54,7 @@ jobs:
5454
5555
ui-build:
5656
docker:
57-
- image: cimg/node:19.8
57+
- image: cimg/node:20.19.0
5858
resource_class: medium
5959
steps:
6060
- checkout

.github/workflows/pr.yaml

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,46 @@ jobs:
1717
- uses: actions/checkout@v4
1818
- uses: actions/setup-node@v4
1919
with:
20-
node-version: '20'
20+
node-version: '22'
2121
- uses: pnpm/action-setup@v4
2222
with:
2323
version: latest
2424
- name: Install dependencies
2525
run: pnpm install
2626
- name: Run CI
2727
run: pnpm run ci
28+
test-vscode-e2e:
29+
runs-on: ubuntu-latest
30+
steps:
31+
- uses: actions/checkout@v4
32+
- uses: actions/setup-node@v4
33+
with:
34+
node-version: '22'
35+
- uses: pnpm/action-setup@v4
36+
with:
37+
version: latest
38+
- name: Install dependencies
39+
run: pnpm install
40+
- name: Set up Python
41+
uses: actions/setup-python@v5
42+
with:
43+
python-version: '3.12'
44+
- name: Install python dependencies
45+
run: |
46+
python -m venv .venv
47+
source .venv/bin/activate
48+
make install-dev
49+
- name: Fetch VS Code
50+
working-directory: ./vscode/extension
51+
run: pnpm run fetch-vscode
52+
53+
- name: Install code-server
54+
run: curl -fsSL https://code-server.dev/install.sh | sh
55+
- name: Install Playwright browsers
56+
working-directory: ./vscode/extension
57+
run: pnpm exec playwright install
58+
- name: Run e2e tests
59+
working-directory: ./vscode/extension
60+
run: |
61+
source ../../.venv/bin/activate
62+
pnpm run test:e2e tests/stop.spec.ts
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: Release VSCode Extension
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
version:
6+
description: 'Version to release (e.g., 1.0.0)'
7+
required: true
8+
type: string
9+
jobs:
10+
release:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout repository
14+
uses: actions/checkout@v4
15+
- name: Check branch is main
16+
run: |
17+
if [[ "${{ github.ref }}" != "refs/heads/main" ]]; then
18+
echo "Error: This workflow can only be run from the main branch"
19+
exit 1
20+
fi
21+
echo "Branch check passed: running from main branch"
22+
- name: Validate version format
23+
run: |
24+
version="${{ github.event.inputs.version }}"
25+
if ! [[ $version =~ ^[0-9]+\.[0-9]+\.[0-9]+(-[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?(\+[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?$ ]]; then
26+
echo "Error: Version must be a valid semantic version (e.g., 1.0.0, 1.0.0-beta.1, 1.0.0+build.1)"
27+
exit 1
28+
fi
29+
echo "Version format is valid: $version"
30+
- name: Setup Node.js
31+
uses: actions/setup-node@v4
32+
with:
33+
node-version: '20'
34+
- name: Install pnpm
35+
uses: pnpm/action-setup@v2
36+
with:
37+
version: 10
38+
- name: Install dependencies
39+
run: pnpm install --frozen-lockfile
40+
- name: Update package.json version
41+
working-directory: vscode/extension
42+
run: |
43+
npm version ${{ github.event.inputs.version }} --no-git-tag-version
44+
- name: Build extension
45+
working-directory: vscode/extension
46+
run: pnpm run vscode:package
47+
- name: Upload extension to Marketplace
48+
working-directory: vscode/extension
49+
run: |
50+
pnpx vsce publish --packagePath sqlmesh-${{ github.event.inputs.version }}.vsix
51+
env:
52+
VSCE_PAT: ${{ secrets.VSCE_PAT }}
53+
- name: Upload extension to OpenVSX
54+
working-directory: vscode/extension
55+
run: |
56+
pnpx ovsx publish -p ${{ secrets.OPEN_VSX_TOKEN }} sqlmesh-${{ github.event.inputs.version }}.vsix

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
20

0 commit comments

Comments
 (0)