Skip to content
Merged

Stage #9270

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
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ aliases:
sudo apt install -y curl gnupg git libappindicator3-1 ca-certificates binutils icnsutils graphicsmagick
python3 -m pip install packaging setuptools
sudo npm install --quiet [email protected] -g
sudo npm install --quiet [email protected] -g
sudo npm config set python /usr/bin/python

- &install-yarn
Expand Down
4 changes: 2 additions & 2 deletions .deploy/api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ RUN apk --update add bash && npm i -g npm@9 \
# Verify installed versions
RUN node --version && npm --version && python3 --version

RUN npm install --quiet [email protected] -g && npm install yarn -g --force
RUN npm install --quiet [email protected] -g && npm install yarn -g --force && npm install --quiet [email protected] -g
RUN mkdir /srv/gauzy && chown -R node:node /srv/gauzy

COPY wait .deploy/api/entrypoint.prod.sh .deploy/api/entrypoint.compose.sh /
Expand Down Expand Up @@ -192,7 +192,7 @@ RUN apk --update add bash && npm i -g npm@9 \
# Verify installed versions
RUN node --version && npm --version && python3 --version

RUN npm install --quiet [email protected] -g && npm install yarn -g --force
RUN npm install --quiet [email protected] -g && npm install yarn -g --force && npm install --quiet [email protected] -g
RUN mkdir /srv/gauzy && chown -R node:node /srv/gauzy

USER node:node
Expand Down
2 changes: 2 additions & 0 deletions .deploy/mcp-auth/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ RUN apk add --no-cache python3 python3-dev py3-pip py3-setuptools build-base gcc
&& npm install --quiet [email protected] -g \
&& npm install yarn -g --force \
&& npm install --quiet [email protected] -g

RUN mkdir /srv/gauzy-mcp-auth && chown -R node:node /srv/gauzy-mcp-auth

USER node:node
Expand Down Expand Up @@ -105,6 +106,7 @@ FROM node:20.18.1-alpine3.19 AS proddependencies

RUN apk add --no-cache python3 python3-dev py3-pip py3-setuptools build-base gcc g++ make autoconf automake git \
&& npm install --quiet [email protected] -g \
&& npm install yarn -g --force \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

syntax: Line uses tab indentation while surrounding lines use spaces

Suggested change
&& npm install yarn -g --force \
&& npm install yarn -g --force \

Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!

Prompt To Fix With AI
This is a comment left during a code review.
Path: .deploy/mcp-auth/Dockerfile
Line: 109:109

Comment:
**syntax:** Line uses tab indentation while surrounding lines use spaces

```suggestion
    && npm install yarn -g --force \
```

<sub>Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!</sub>

How can I resolve this? If you propose a fix, please make it concise.

&& npm install --quiet [email protected] -g

USER node:node
Expand Down
1 change: 1 addition & 0 deletions .deploy/mcp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ FROM node:20.18.1-alpine3.19 AS proddependencies

RUN apk add --no-cache python3 python3-dev py3-pip py3-setuptools build-base gcc g++ make autoconf automake git \
&& npm install --quiet [email protected] -g \
&& npm install yarn -g --force \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

syntax: Line uses tab indentation while surrounding lines use spaces

Suggested change
&& npm install yarn -g --force \
&& npm install yarn -g --force \

Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!

Prompt To Fix With AI
This is a comment left during a code review.
Path: .deploy/mcp/Dockerfile
Line: 153:153

Comment:
**syntax:** Line uses tab indentation while surrounding lines use spaces

```suggestion
    && npm install yarn -g --force \
```

<sub>Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!</sub>

How can I resolve this? If you propose a fix, please make it concise.

&& npm install --quiet [email protected] -g

USER node:node
Expand Down
78 changes: 66 additions & 12 deletions .github/workflows/agent-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Install Node.js, NPM and Yarn
uses: buildjet/setup-node@v4
with:
node-version: 20.18.1
node-version: 22.21.1
cache: "yarn"

- name: Change permissions
Expand All @@ -39,10 +39,10 @@ jobs:
run: python3 -m pip install packaging setuptools

- name: Install latest version of NPM
run: "sudo npm install -g npm@9"
run: "sudo npm install -g npm@10.9.4"

- name: Install node-gyp package
run: "sudo npm install --quiet -g [email protected]"
- name: Install globally node-gyp, ts-node and nx packages
run: "sudo npm install --quiet -g [email protected] [email protected] [email protected]"

- name: Install Yarn dependencies
run: "yarn install --network-timeout 1000000 --frozen-lockfile --ignore-scripts"
Expand Down Expand Up @@ -93,17 +93,17 @@ jobs:
- name: Install Node.js, NPM and Yarn
uses: actions/setup-node@v4
with:
node-version: 20.18.1
node-version: 22.21.1
cache: "yarn"

- name: Fix node-gyp and Python
run: python3 -m pip install --break-system-packages packaging setuptools

- name: Install latest version of NPM
run: "sudo npm install -g npm@9"
run: "sudo npm install -g npm@10.9.4"

- name: Install node-gyp package
run: "sudo npm install --quiet -g [email protected]"
- name: Install globally node-gyp, ts-node and nx packages
run: "sudo npm install --quiet -g [email protected] [email protected] [email protected]"

- name: Install Yarn dependencies
run: "yarn install --network-timeout 1000000 --frozen-lockfile --ignore-scripts"
Expand Down Expand Up @@ -157,17 +157,49 @@ jobs:
- name: Install Node.js, NPM and Yarn
uses: actions/setup-node@v4
with:
node-version: 20.18.1
node-version: 22.21.1
cache: "yarn"

- name: Install Visual Studio 2022 Build Tools (VCTools)
shell: powershell
run: |
choco install -y visualstudio2022buildtools --execution-timeout=21600 --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended --includeOptional --passive --norestart"

- name: Configure node-gyp to use VS 2022
shell: powershell
run: |
"GYP_MSVS_VERSION=2022" | Out-File -FilePath $env:GITHUB_ENV -Append
"npm_config_msvs_version=2022" | Out-File -FilePath $env:GITHUB_ENV -Append

- name: Fix node-gyp and Python
run: python3 -m pip install packaging setuptools

- name: Setup MSVC (VS 2022 dev env)
uses: ilammy/msvc-dev-cmd@v1
with:
arch: x64

- name: Install latest version of NPM
run: "npm install -g npm@9"
run: "npm install -g npm@10.9.4"

- name: Install node-gyp package
run: "npm install --quiet -g [email protected]"
- name: Install globally node-gyp, ts-node and nx packages
run: "npm install --quiet -g [email protected] [email protected] [email protected]"

- name: Configure npm python for node-gyp
shell: powershell
run: |
$py = (Get-Command python.exe).Source
Write-Host "python is: $py"
"npm_config_python=$py" | Out-File -FilePath $env:GITHUB_ENV -Append
"PYTHON=$py" | Out-File -FilePath $env:GITHUB_ENV -Append

- name: Show tool versions
shell: powershell
run: |
node -v
npm -v
python --version
python -c "import sys; print(sys.executable)"

- name: Install Yarn dependencies
run: "yarn install --network-timeout 1000000 --frozen-lockfile --ignore-scripts"
Expand All @@ -188,8 +220,30 @@ jobs:
AGENT_APP_DESCRIPTION: "Ever Gauzy Agent"
AGENT_APP_ID: "com.ever.gauzyagent"

- name: Add Yarn/Node/npm-global/node_modules to GITHUB_PATH
shell: powershell
run: |
$yarnPath = (Get-Command yarn).Source | Split-Path -Parent
$nodePath = (Get-Command node).Source | Split-Path -Parent
$npmGlobalBin = npm config get prefix
$localBin = Join-Path $PWD "node_modules\.bin"
echo $localBin >> $env:GITHUB_PATH
echo $npmGlobalBin >> $env:GITHUB_PATH
echo $yarnPath >> $env:GITHUB_PATH
if ($nodePath -ne $yarnPath) { echo $nodePath >> $env:GITHUB_PATH }
Write-Host "Added to GITHUB_PATH: $localBin, $npmGlobalBin, $yarnPath, $nodePath"

- name: Build Agent
shell: powershell
run: |
Write-Host "=== Command locations ==="
Write-Host "Node: $((Get-Command node -ErrorAction SilentlyContinue).Source)"
Write-Host "Yarn: $((Get-Command yarn -ErrorAction SilentlyContinue).Source)"
Write-Host "ts-node: $((Get-Command ts-node -ErrorAction SilentlyContinue).Source)"
Write-Host "cross-env: $((Get-Command cross-env -ErrorAction SilentlyContinue).Source)"
Write-Host "nx: $((Get-Command nx -ErrorAction SilentlyContinue).Source)"
Write-Host ""
Write-Host "=== Starting build ==="
yarn build:agent:windows:release:gh
env:
USE_HARD_LINKS: false
Expand Down
78 changes: 66 additions & 12 deletions .github/workflows/agent-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Install Node.js, NPM and Yarn
uses: buildjet/setup-node@v4
with:
node-version: 20.18.1
node-version: 22.21.1
cache: "yarn"

- name: Change permissions
Expand All @@ -39,10 +39,10 @@ jobs:
run: python3 -m pip install packaging setuptools

- name: Install latest version of NPM
run: "sudo npm install -g npm@9"
run: "sudo npm install -g npm@10.9.4"

- name: Install node-gyp package
run: "sudo npm install --quiet -g [email protected]"
- name: Install globally node-gyp, ts-node and nx packages
run: "sudo npm install --quiet -g [email protected] [email protected] [email protected]"

- name: Install Yarn dependencies
run: "yarn install --network-timeout 1000000 --frozen-lockfile --ignore-scripts"
Expand Down Expand Up @@ -93,17 +93,17 @@ jobs:
- name: Install Node.js, NPM and Yarn
uses: actions/setup-node@v4
with:
node-version: 20.18.1
node-version: 22.21.1
cache: "yarn"

- name: Fix node-gyp and Python
run: python3 -m pip install --break-system-packages packaging setuptools

- name: Install latest version of NPM
run: "sudo npm install -g npm@9"
run: "sudo npm install -g npm@10.9.4"

- name: Install node-gyp package
run: "sudo npm install --quiet -g [email protected]"
- name: Install globally node-gyp, ts-node and nx packages
run: "sudo npm install --quiet -g [email protected] [email protected] [email protected]"

- name: Install Yarn dependencies
run: "yarn install --network-timeout 1000000 --frozen-lockfile --ignore-scripts"
Expand Down Expand Up @@ -157,17 +157,49 @@ jobs:
- name: Install Node.js, NPM and Yarn
uses: actions/setup-node@v4
with:
node-version: 20.18.1
node-version: 22.21.1
cache: "yarn"

- name: Install Visual Studio 2022 Build Tools (VCTools)
shell: powershell
run: |
choco install -y visualstudio2022buildtools --execution-timeout=21600 --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended --includeOptional --passive --norestart"

- name: Configure node-gyp to use VS 2022
shell: powershell
run: |
"GYP_MSVS_VERSION=2022" | Out-File -FilePath $env:GITHUB_ENV -Append
"npm_config_msvs_version=2022" | Out-File -FilePath $env:GITHUB_ENV -Append

- name: Fix node-gyp and Python
run: python3 -m pip install packaging setuptools

- name: Setup MSVC (VS 2022 dev env)
uses: ilammy/msvc-dev-cmd@v1
with:
arch: x64

- name: Install latest version of NPM
run: "npm install -g npm@9"
run: "npm install -g npm@10.9.4"

- name: Install node-gyp package
run: "npm install --quiet -g [email protected]"
- name: Install globally node-gyp, ts-node and nx packages
run: "npm install --quiet -g [email protected] [email protected] [email protected]"

- name: Configure npm python for node-gyp
shell: powershell
run: |
$py = (Get-Command python.exe).Source
Write-Host "python is: $py"
"npm_config_python=$py" | Out-File -FilePath $env:GITHUB_ENV -Append
"PYTHON=$py" | Out-File -FilePath $env:GITHUB_ENV -Append

- name: Show tool versions
shell: powershell
run: |
node -v
npm -v
python --version
python -c "import sys; print(sys.executable)"

- name: Install Yarn dependencies
run: "yarn install --network-timeout 1000000 --frozen-lockfile --ignore-scripts"
Expand All @@ -188,8 +220,30 @@ jobs:
AGENT_APP_DESCRIPTION: "Ever Gauzy Agent"
AGENT_APP_ID: "com.ever.gauzyagent"

- name: Add Yarn/Node/npm-global/node_modules to GITHUB_PATH
shell: powershell
run: |
$yarnPath = (Get-Command yarn).Source | Split-Path -Parent
$nodePath = (Get-Command node).Source | Split-Path -Parent
$npmGlobalBin = npm config get prefix
$localBin = Join-Path $PWD "node_modules\.bin"
echo $localBin >> $env:GITHUB_PATH
echo $npmGlobalBin >> $env:GITHUB_PATH
echo $yarnPath >> $env:GITHUB_PATH
if ($nodePath -ne $yarnPath) { echo $nodePath >> $env:GITHUB_PATH }
Write-Host "Added to GITHUB_PATH: $localBin, $npmGlobalBin, $yarnPath, $nodePath"

- name: Build Agent
shell: powershell
run: |
Write-Host "=== Command locations ==="
Write-Host "Node: $((Get-Command node -ErrorAction SilentlyContinue).Source)"
Write-Host "Yarn: $((Get-Command yarn -ErrorAction SilentlyContinue).Source)"
Write-Host "ts-node: $((Get-Command ts-node -ErrorAction SilentlyContinue).Source)"
Write-Host "cross-env: $((Get-Command cross-env -ErrorAction SilentlyContinue).Source)"
Write-Host "nx: $((Get-Command nx -ErrorAction SilentlyContinue).Source)"
Write-Host ""
Write-Host "=== Starting build ==="
yarn build:agent:windows:release:gh
env:
USE_HARD_LINKS: false
Expand Down
Loading
Loading