-
Notifications
You must be signed in to change notification settings - Fork 714
Stage #9270
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Stage #9270
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
abf276d
Update Node.js and NPM versions in workflow
evereq 4c81fdb
Update windows.yml
evereq d05f9d1
fix: build Windows
evereq c66a655
fix: Windows builds
evereq 7ebd45c
fix: windows builds
evereq 64fdfdf
chore: fix Windows builds
evereq d5e76ee
fix: windows builds
evereq 9f438dd
fix: builds
evereq e1555da
chore: add ts-node to some packages
evereq 12bc806
chore: more fixes for builds
evereq 4c3c829
chore: fixes for Windows builds and update Node to v22 for desktop ap…
evereq File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 / | ||
|
|
@@ -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 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 | ||
|
|
@@ -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 \ | ||
| && npm install --quiet [email protected] -g | ||
|
|
||
| USER node:node | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -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 \ | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. syntax: Line uses tab indentation while surrounding lines use spaces
Suggested change
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 AIThis 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 | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 | ||
|
|
@@ -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" | ||
|
|
@@ -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" | ||
|
|
@@ -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" | ||
|
|
@@ -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 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 | ||
|
|
@@ -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" | ||
|
|
@@ -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" | ||
|
|
@@ -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" | ||
|
|
@@ -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 | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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
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