Skip to content

Commit dce2ad8

Browse files
committed
Merge remote-tracking branch 'origin/develop' into bwq/0904_re
# Conflicts: # frontend/app/[locale]/setup/agentSetup/components/agent/AgentCallRelationshipModal.tsx # frontend/types/agentConfig.ts
2 parents 29980b3 + 4b1f33b commit dce2ad8

33 files changed

+1178
-880
lines changed

.github/workflows/automic-build-data-process-dev.yml renamed to .github/workflows/auto-build-data-process-dev.yml

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,19 @@ on:
1212
- 'backend/**'
1313
- 'sdk/**'
1414
- 'make/data_process/**'
15+
- '.github/workflows/**'
1516
push:
1617
branches: [develop]
1718
paths:
1819
- 'backend/**'
1920
- 'sdk/**'
2021
- 'make/data_process/**'
22+
- '.github/workflows/**'
2123

2224
jobs:
2325
build-data-process-amd64:
2426
runs-on: ubuntu-latest
2527
steps:
26-
- name: Free up disk space on GitHub runner
27-
run: |
28-
sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
29-
- name: Set up Docker Buildx
30-
run: |
31-
if ! docker buildx inspect nexent_builder > /dev/null 2>&1; then
32-
docker buildx create --name nexent_builder --use
33-
else
34-
docker buildx use nexent_builder
35-
fi
3628
- name: Checkout code
3729
uses: actions/checkout@v4
3830
- name: Clone model
@@ -43,21 +35,11 @@ jobs:
4335
rm -rf .git .gitattributes
4436
- name: Build data process image (amd64) and load locally
4537
run: |
46-
docker buildx build --platform linux/amd64 -t nexent/nexent-data-process:dev-amd64 --load -f make/data_process/Dockerfile .
38+
docker build --platform linux/amd64 -t nexent/nexent-data-process:dev-amd64 -f make/data_process/Dockerfile .
4739
4840
build-data-process-arm64:
49-
runs-on: ubuntu-latest
41+
runs-on: ubuntu-24.04-arm
5042
steps:
51-
- name: Free up disk space on GitHub runner
52-
run: |
53-
sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
54-
- name: Set up Docker Buildx
55-
run: |
56-
if ! docker buildx inspect nexent_builder > /dev/null 2>&1; then
57-
docker buildx create --name nexent_builder --use
58-
else
59-
docker buildx use nexent_builder
60-
fi
6143
- name: Checkout code
6244
uses: actions/checkout@v4
6345
- name: Clone model
@@ -68,4 +50,4 @@ jobs:
6850
rm -rf .git .gitattributes
6951
- name: Build data process image (arm64) and load locally
7052
run: |
71-
docker buildx build --platform linux/arm64 -t nexent/nexent-data-process:dev-arm64 --load -f make/data_process/Dockerfile .
53+
docker build --platform linux/arm64 -t nexent/nexent-data-process:dev-arm64 -f make/data_process/Dockerfile .
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: Docker Build Doc Check
2+
3+
concurrency:
4+
group: docker-build-doc-dev-${{ github.ref }}
5+
cancel-in-progress: true
6+
7+
on:
8+
workflow_dispatch:
9+
pull_request:
10+
branches: [develop]
11+
paths:
12+
- 'doc/**'
13+
- '.github/workflows/**'
14+
push:
15+
branches: [develop]
16+
paths:
17+
- 'doc/**'
18+
- '.github/workflows/**'
19+
20+
jobs:
21+
build-docs-check:
22+
runs-on: ubuntu-latest
23+
steps:
24+
- name: Checkout code
25+
uses: actions/checkout@v4
26+
27+
- name: Setup Node.js
28+
uses: actions/setup-node@v4
29+
with:
30+
node-version: '18'
31+
32+
- name: Install dependencies
33+
run: |
34+
cd doc
35+
npm install
36+
37+
- name: Build doc
38+
run: |
39+
cd doc
40+
npm run docs:build
41+
BUILD_EXIT_CODE=$?
42+
43+
if [ $BUILD_EXIT_CODE -ne 0 ]; then
44+
echo "❌ Doc build failed with exit code $BUILD_EXIT_CODE"
45+
exit $BUILD_EXIT_CODE
46+
else
47+
echo "✅ Doc build completed successfully"
48+
fi
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Docker Build Main Images
2+
3+
concurrency:
4+
group: docker-build-main-dev-${{ github.ref }}
5+
cancel-in-progress: true
6+
7+
on:
8+
workflow_dispatch:
9+
pull_request:
10+
branches: [develop]
11+
paths:
12+
- 'backend/**'
13+
- 'sdk/**'
14+
- 'make/main/**'
15+
- '.github/workflows/**'
16+
push:
17+
branches: [develop]
18+
paths:
19+
- 'backend/**'
20+
- 'sdk/**'
21+
- 'make/main/**'
22+
- '.github/workflows/**'
23+
24+
jobs:
25+
build-main-amd64:
26+
runs-on: ubuntu-latest
27+
steps:
28+
- name: Checkout code
29+
uses: actions/checkout@v4
30+
- name: Build main image (amd64) and load locally
31+
run: |
32+
docker build --platform linux/amd64 -t nexent/nexent:dev-amd64 -f make/main/Dockerfile .
33+
34+
build-main-arm64:
35+
runs-on: ubuntu-24.04-arm
36+
steps:
37+
- name: Checkout code
38+
uses: actions/checkout@v4
39+
- name: Build main image (arm64) and load locally
40+
run: |
41+
docker build --platform linux/arm64 -t nexent/nexent:dev-arm64 -f make/main/Dockerfile .
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Docker Build Terminal Images
2+
3+
concurrency:
4+
group: docker-build-terminal-dev-${{ github.ref }}
5+
cancel-in-progress: true
6+
7+
on:
8+
workflow_dispatch:
9+
pull_request:
10+
branches: [develop]
11+
paths:
12+
- 'make/terminal/**'
13+
- '.github/workflows/**'
14+
push:
15+
branches: [develop]
16+
paths:
17+
- 'make/terminal/**'
18+
- '.github/workflows/**'
19+
20+
jobs:
21+
build-terminal-amd64:
22+
runs-on: ubuntu-latest
23+
steps:
24+
- name: Checkout code
25+
uses: actions/checkout@v4
26+
- name: Build terminal image (amd64) and load locally
27+
run: |
28+
docker build --platform linux/amd64 -t nexent/nexent-ubuntu-terminal:dev-amd64 -f make/terminal/Dockerfile .
29+
30+
build-terminal-arm64:
31+
runs-on: ubuntu-24.04-arm
32+
steps:
33+
- name: Checkout code
34+
uses: actions/checkout@v4
35+
- name: Build terminal image (arm64) and load locally
36+
run: |
37+
docker build --platform linux/arm64 -t nexent/nexent-ubuntu-terminal:dev-arm64 -f make/terminal/Dockerfile .
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Docker Build Web Images
2+
3+
concurrency:
4+
group: docker-build-web-dev-${{ github.ref }}
5+
cancel-in-progress: true
6+
7+
on:
8+
workflow_dispatch:
9+
pull_request:
10+
branches: [develop]
11+
paths:
12+
- 'frontend/**'
13+
- 'make/web/**'
14+
- '.github/workflows/**'
15+
push:
16+
branches: [develop]
17+
paths:
18+
- 'frontend/**'
19+
- 'make/web/**'
20+
- '.github/workflows/**'
21+
22+
jobs:
23+
build-web-amd64:
24+
runs-on: ubuntu-latest
25+
steps:
26+
- name: Checkout code
27+
uses: actions/checkout@v4
28+
- name: Build web image (amd64) and load locally
29+
run: |
30+
docker build --platform linux/amd64 -t nexent/nexent-web:dev-amd64 -f make/web/Dockerfile .
31+
32+
build-web-arm64:
33+
runs-on: ubuntu-24.04-arm
34+
steps:
35+
- name: Checkout code
36+
uses: actions/checkout@v4
37+
- name: Build web image (arm64) and load locally
38+
run: |
39+
docker build --platform linux/arm64 -t nexent/nexent-web:dev-arm64 -f make/web/Dockerfile .
File renamed without changes.
File renamed without changes.

.github/workflows/automic-build-main-dev.yml

Lines changed: 0 additions & 53 deletions
This file was deleted.

.github/workflows/automic-build-terminal-dev.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)