Skip to content

Commit ca4860a

Browse files
committed
Merge main
2 parents 1875f98 + 2929f97 commit ca4860a

158 files changed

Lines changed: 17183 additions & 1144 deletions

File tree

Some content is hidden

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

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ WORKDIR /root/.mcp/openops-mcp
6868
RUN <<-```
6969
set -ex
7070
git clone https://github.com/openops-cloud/openops-mcp .
71-
git checkout 7f964bd4fcfd46fbb7ab4b96abd15e4d3d77758d
71+
git checkout 5d6d9e515ad27bf1237d7e4df84b9ba9832214fb
7272
wget -qO- https://astral.sh/uv/install.sh | sh && source $HOME/.local/bin/env
7373
uv venv && . .venv/bin/activate && uv pip install -r requirements.txt
7474
```

.github/workflows/chromatic.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# .github/workflows/chromatic.yml
22

3-
name: "Chromatic"
3+
name: 'Chromatic'
44

55
on:
66
push:
@@ -24,7 +24,7 @@ jobs:
2424

2525
- name: Cache node_modules
2626
id: node-modules-cache
27-
uses: actions/cache@v5.0.3
27+
uses: actions/cache@v5.0.4
2828
with:
2929
path: node_modules
3030
key: node-modules-cache-${{ hashFiles('package-lock.json', '.npmrc') }}
@@ -36,7 +36,7 @@ jobs:
3636

3737
- name: Run Chromatic
3838
if: env.CHROMATIC_PROJECT_TOKEN
39-
uses: chromaui/action@v15.3.0
39+
uses: chromaui/action@v16.0.0
4040
with:
4141
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
4242
onlyChanged: true # 👈 Required option to enable TurboSnap

.github/workflows/ci.yml

Lines changed: 44 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- uses: actions/checkout@v6.0.2
1818
- name: Lookup node_modules cache
1919
id: node-modules-cache
20-
uses: actions/cache@v5.0.3
20+
uses: actions/cache@v5.0.4
2121
with:
2222
path: node_modules
2323
key: node-modules-cache-${{ hashFiles('package-lock.json', '.npmrc') }}
@@ -34,7 +34,7 @@ jobs:
3434
- uses: actions/checkout@v6.0.2
3535
- name: Restore node_modules cache
3636
id: node-modules-cache
37-
uses: actions/cache/restore@v5.0.3
37+
uses: actions/cache/restore@v5.0.4
3838
with:
3939
path: node_modules
4040
key: node-modules-cache-${{ hashFiles('package-lock.json', '.npmrc') }}
@@ -49,13 +49,13 @@ jobs:
4949
- uses: actions/checkout@v6.0.2
5050
- name: Restore node_modules cache
5151
id: node-modules-cache
52-
uses: actions/cache/restore@v5.0.3
52+
uses: actions/cache/restore@v5.0.4
5353
with:
5454
path: node_modules
5555
key: node-modules-cache-${{ hashFiles('package-lock.json', '.npmrc') }}
5656
fail-on-cache-miss: true
5757
- name: Restore NX cache
58-
uses: actions/cache@v5.0.3
58+
uses: actions/cache@v5.0.4
5959
with:
6060
path: .nx/cache
6161
key: nx-lint-${{ github.sha }}
@@ -85,7 +85,7 @@ jobs:
8585
uses: actions/checkout@v6.0.2
8686
- name: Restore node_modules cache
8787
id: node-modules-cache
88-
uses: actions/cache/restore@v5.0.3
88+
uses: actions/cache/restore@v5.0.4
8989
with:
9090
path: node_modules
9191
key: node-modules-cache-${{ hashFiles('package-lock.json', '.npmrc') }}
@@ -104,41 +104,41 @@ jobs:
104104
commit_message: Update THIRD_PARTY_LICENSES.txt
105105
test:
106106
strategy:
107-
matrix:
108-
test-suits:
109-
- name: UI
110-
include: ui-*,*-ui
111-
- name: Blocks Shard 1
112-
include: blocks-a*,blocks-c*,blocks-d*,
113-
- name: Blocks Shard 2
114-
include: blocks-f*,blocks-g*,blocks-m*,
115-
- name: Blocks Shard 3
116-
include: blocks-*
117-
exclude: blocks-a*,blocks-c*,blocks-d*,blocks-f*,blocks-g*,blocks-m*,
118-
- name: Server API Unit Tests
119-
key: server-api-unit
120-
target: test-unit
121-
include: server-api
122-
- name: Server API Integration Tests
123-
key: server-api-integration
124-
include: server-api
125-
- name: Engine and Libraries
126-
key: others
127-
exclude: ui-*,*-ui,blocks-*,server-api
107+
matrix:
108+
test-suits:
109+
- name: UI
110+
include: ui-*,*-ui
111+
- name: Blocks Shard 1
112+
include: blocks-a*,blocks-c*,blocks-d*,
113+
- name: Blocks Shard 2
114+
include: blocks-f*,blocks-g*,blocks-m*,
115+
- name: Blocks Shard 3
116+
include: blocks-*
117+
exclude: blocks-a*,blocks-c*,blocks-d*,blocks-f*,blocks-g*,blocks-m*,
118+
- name: Server API Unit Tests
119+
key: server-api-unit
120+
target: test-unit
121+
include: server-api
122+
- name: Server API Integration Tests
123+
key: server-api-integration
124+
include: server-api
125+
- name: Engine and Libraries
126+
key: others
127+
exclude: ui-*,*-ui,blocks-*,server-api
128128
name: Test ${{ matrix.test-suits.name }}
129129
needs: install
130130
runs-on: ubuntu-latest
131131
steps:
132132
- uses: actions/checkout@v6.0.2
133133
- name: Restore node_modules cache
134134
id: node-modules-cache
135-
uses: actions/cache/restore@v5.0.3
135+
uses: actions/cache/restore@v5.0.4
136136
with:
137137
path: node_modules
138138
key: node-modules-cache-${{ hashFiles('package-lock.json', '.npmrc') }}
139139
fail-on-cache-miss: true
140140
- name: Restore NX cache
141-
uses: actions/cache@v5.0.3
141+
uses: actions/cache@v5.0.4
142142
with:
143143
path: .nx/cache
144144
key: nx-test-${{ matrix.test-suits.key || matrix.test-suits.name }}-${{ github.sha }}
@@ -147,7 +147,7 @@ jobs:
147147
- name: Test
148148
if: steps.nx-test-cache.outputs.cache-hit != 'true'
149149
continue-on-error: false
150-
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08
150+
uses: nick-fields/retry@ad984534de44a9489a53aefd81eb77f87c70dc60
151151
with:
152152
timeout_minutes: 10
153153
max_attempts: 3
@@ -165,13 +165,13 @@ jobs:
165165
- uses: actions/checkout@v6.0.2
166166
- name: Restore node_modules cache
167167
id: node-modules-cache
168-
uses: actions/cache/restore@v5.0.3
168+
uses: actions/cache/restore@v5.0.4
169169
with:
170170
path: node_modules
171171
key: node-modules-cache-${{ hashFiles('package-lock.json', '.npmrc') }}
172172
fail-on-cache-miss: true
173173
- name: Restore NX cache
174-
uses: actions/cache@v5.0.3
174+
uses: actions/cache@v5.0.4
175175
with:
176176
path: .nx/cache
177177
key: nx-build-${{ github.sha }}
@@ -184,28 +184,28 @@ jobs:
184184
npx nx run-many --target=build
185185
./tools/truncate-nx-cache.sh
186186
- name: Save build cache
187-
uses: actions/cache/save@v5.0.3
187+
uses: actions/cache/save@v5.0.4
188188
with:
189189
path: dist
190190
key: dist-${{ github.sha }}
191191
build-images:
192192
strategy:
193-
matrix:
194-
target:
195-
- name: App
196-
file: Dockerfile
197-
repository: openops-app
198-
- name: Engine
199-
file: engine.Dockerfile
200-
repository: openops-engine
201-
platform: [amd64, arm64]
193+
matrix:
194+
target:
195+
- name: App
196+
file: Dockerfile
197+
repository: openops-app
198+
- name: Engine
199+
file: engine.Dockerfile
200+
repository: openops-engine
201+
platform: [amd64, arm64]
202202
name: Build ${{ matrix.target.name }} Image for ${{ matrix.platform }}
203203
needs: build
204204
runs-on: ${{ matrix.platform == 'amd64' && 'ubuntu-latest' || 'ubuntu-arm64' }}
205205
steps:
206206
- uses: actions/checkout@v6.0.2
207207
- name: Restore build cache
208-
uses: actions/cache/restore@v5.0.3
208+
uses: actions/cache/restore@v5.0.4
209209
with:
210210
path: dist
211211
key: dist-${{ github.sha }}
@@ -222,7 +222,7 @@ jobs:
222222
- name: Login to Amazon ECR
223223
id: login-ecr
224224
if: vars.ECR_REGION
225-
uses: aws-actions/amazon-ecr-login@v2.0.2
225+
uses: aws-actions/amazon-ecr-login@v2.1.0
226226
- name: Format image tag parts
227227
env:
228228
BRANCH: ${{ github.head_ref || github.ref_name }}
@@ -278,7 +278,7 @@ jobs:
278278
aws-region: ${{ vars.ECR_REGION }}
279279
- name: Login to Amazon ECR
280280
id: login-ecr
281-
uses: aws-actions/amazon-ecr-login@v2.0.2
281+
uses: aws-actions/amazon-ecr-login@v2.1.0
282282
- name: Format image tag components
283283
env:
284284
BRANCH: ${{ github.head_ref || github.ref_name }}
@@ -304,5 +304,3 @@ jobs:
304304
docker manifest push $BASE_REPOSITORY_URI:$SANITIZED_BRANCH
305305
306306
echo "✅ Successfully pushed image $BASE_REPOSITORY_URI:$SANITIZED_BRANCH" >> $GITHUB_STEP_SUMMARY
307-
308-

.github/workflows/release.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ jobs:
2222
outputs:
2323
version: ${{ inputs.version || steps.semver.outputs.nextVersion }}
2424
steps:
25-
- name: Get next version
26-
if: inputs.version == ''
27-
id: semver
28-
uses: flatherskevin/semver-action@fc3c4e67353e3c45b8164521ddd17c9e38d6d4d8
29-
with:
30-
incrementLevel: patch
31-
source: tags
25+
- name: Get next version
26+
if: inputs.version == ''
27+
id: semver
28+
uses: flatherskevin/semver-action@7ce18d3c29fa36251f492a5121013455741c072c
29+
with:
30+
incrementLevel: patch
31+
source: tags
3232
tag-images-for-release:
3333
needs: get-version
3434
strategy:
@@ -53,9 +53,9 @@ jobs:
5353
aws-region: ${{ vars.ECR_REGION }}
5454
- name: Login to private ECR
5555
id: login-private-ecr
56-
uses: aws-actions/amazon-ecr-login@v2.0.2
56+
uses: aws-actions/amazon-ecr-login@v2.1.0
5757
- name: Login to public ECR
58-
uses: aws-actions/amazon-ecr-login@v2.0.2
58+
uses: aws-actions/amazon-ecr-login@v2.1.0
5959
env:
6060
AWS_REGION: ${{ vars.ECR_PUBLIC_REGION }}
6161
with:

.husky/pre-commit

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
npx lint-staged --verbose

.lintstagedrc.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"*.{ts,tsx,js,jsx,json,css,scss,md,html,yaml,yml}": "prettier --write"
3+
}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ WORKDIR /root/.mcp/openops-mcp
1717
RUN <<-```
1818
set -ex
1919
git clone https://github.com/openops-cloud/openops-mcp .
20-
git checkout 7f964bd4fcfd46fbb7ab4b96abd15e4d3d77758d
20+
git checkout 5d6d9e515ad27bf1237d7e4df84b9ba9832214fb
2121
wget -qO- https://astral.sh/uv/install.sh | sh && source $HOME/.local/bin/env
2222
uv venv && . .venv/bin/activate && uv pip install -r requirements.txt
2323
```

0 commit comments

Comments
 (0)