Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Change npm registry to nexus for CI test and enable turbo remote cache #2535

Merged
merged 10 commits into from
Apr 2, 2024
Merged

Change npm registry to nexus for CI test and enable turbo remote cache #2535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift click to select a range
96639d0
Change npm registry to nexus for CI test
hientominh Mar 29, 2024
2bb7cf0
Change npm registry to nexus for CI test
hientominh Mar 29, 2024
a38d56f
Merge branch 'chore/ci-cache-npm-with-nexus' of github.com:janhq/jan …
hientominh Mar 29, 2024
680825e
Add yarn.lock
hientominh Mar 29, 2024
8f7a017
Remove clean step
hientominh Mar 29, 2024
c25c8ff
Merge branch 'dev' into chore/ci-cache-npm-with-nexus
hientominh Mar 29, 2024
bda664d
Revert to disable yarn.lock file
hientominh Mar 29, 2024
a03e8a1
Turn NPM Proxy to env
hientominh Mar 29, 2024
6d4dd13
Merge branch 'dev' into chore/ci-cache-npm-with-nexus
hientominh Apr 2, 2024
7e1f69a
Merge branch 'dev' into chore/ci-cache-npm-with-nexus
hiento09 Apr 2, 2024
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
55 changes: 23 additions & 32 deletions .github/workflows/jan-electron-linter-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 40,6 @@ jobs:
test-on-macos:
runs-on: [self-hosted, macOS, macos-desktop]
steps:
- name: "Cleanup build folder"
run: |
ls -la ./
rm -rf ./* || true
rm -rf ./.??* || true
ls -la ./
rm -rf ~/Library/Application\ Support/jan
- name: Getting the repo
uses: actions/checkout@v3

Expand All @@ -62,9 55,14 @@ jobs:

- name: Linter and test
run: |
npm config set registry ${{ secrets.NPM_PROXY }} --global
yarn config set registry ${{ secrets.NPM_PROXY }} --global
make test
env:
CSC_IDENTITY_AUTO_DISCOVERY: "false"
TURBO_API: "${{ secrets.TURBO_API }}"
TURBO_TEAM: "macos"
TURBO_TOKEN: "${{ secrets.TURBO_TOKEN }}"

test-on-windows:
if: github.event_name == 'push'
Expand All @@ -74,15 72,6 @@ jobs:
antivirus-tools: ['mcafee', 'default-windows-security','bit-defender']
runs-on: windows-desktop-${{ matrix.antivirus-tools }}
steps:
- name: Clean workspace
run: |
Remove-Item -Path "\\?\$(Get-Location)\*" -Force -Recurse
$path = "$Env:APPDATA\jan"
if (Test-Path $path) {
Remove-Item "\\?\$path" -Recurse -Force
} else {
Write-Output "Folder does not exist."
}
- name: Getting the repo
uses: actions/checkout@v3

Expand All @@ -101,20 90,17 @@ jobs:
- name: Linter and test
shell: powershell
run: |
npm config set registry ${{ secrets.NPM_PROXY }} --global
yarn config set registry ${{ secrets.NPM_PROXY }} --global
make test
env:
TURBO_API: "${{ secrets.TURBO_API }}"
TURBO_TEAM: "windows"
TURBO_TOKEN: "${{ secrets.TURBO_TOKEN }}"
test-on-windows-pr:
if: github.event_name == 'pull_request'
runs-on: windows-desktop-default-windows-security
steps:
- name: Clean workspace
run: |
Remove-Item -Path "\\?\$(Get-Location)\*" -Force -Recurse
$path = "$Env:APPDATA\jan"
if (Test-Path $path) {
Remove-Item "\\?\$path" -Recurse -Force
} else {
Write-Output "Folder does not exist."
}
- name: Getting the repo
uses: actions/checkout@v3

Expand All @@ -133,18 119,17 @@ jobs:
- name: Linter and test
shell: powershell
run: |
npm config set registry ${{ secrets.NPM_PROXY }} --global
yarn config set registry ${{ secrets.NPM_PROXY }} --global
make test
env:
TURBO_API: "${{ secrets.TURBO_API }}"
TURBO_TEAM: "windows"
TURBO_TOKEN: "${{ secrets.TURBO_TOKEN }}"

test-on-ubuntu:
runs-on: [self-hosted, Linux, ubuntu-desktop]
steps:
- name: "Cleanup build folder"
run: |
ls -la ./
rm -rf ./* || true
rm -rf ./.??* || true
ls -la ./
rm -rf ~/.config/jan
- name: Getting the repo
uses: actions/checkout@v3

Expand All @@ -162,4 147,10 @@ jobs:
run: |
export DISPLAY=$(w -h | awk 'NR==1 {print $2}')
echo -e "Display ID: $DISPLAY"
npm config set registry ${{ secrets.NPM_PROXY }} --global
yarn config set registry ${{ secrets.NPM_PROXY }} --global
make test
env:
TURBO_API: "${{ secrets.TURBO_API }}"
TURBO_TEAM: "linux"
TURBO_TOKEN: "${{ secrets.TURBO_TOKEN }}"
18 changes: 13 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 53,24 @@ build: check-file-counts

clean:
ifeq ($(OS),Windows_NT)
powershell -Command "Get-ChildItem -Path . -Include node_modules, .next, dist, build, out -Recurse -Directory | Remove-Item -Recurse -Force"
powershell -Command "Get-ChildItem -Path . -Include package-lock.json -Recurse -File | Remove-Item -Recurse -Force"
powershell -Command "Remove-Item -Recurse -Force ./pre-install/*.tgz"
powershell -Command "Remove-Item -Recurse -Force ./electron/pre-install/*.tgz"
powershell -Command "if (Test-Path \"$($env:USERPROFILE)\jan\extensions\") { Remove-Item -Path \"$($env:USERPROFILE)\jan\extensions\" -Recurse -Force }"
-powershell -Command "Get-ChildItem -Path . -Include node_modules, .next, dist, build, out, .turbo -Recurse -Directory | Remove-Item -Recurse -Force"
-powershell -Command "Get-ChildItem -Path . -Include package-lock.json -Recurse -File | Remove-Item -Recurse -Force"
-powershell -Command "Get-ChildItem -Path . -Include yarn.lock -Recurse -File | Remove-Item -Recurse -Force"
-powershell -Command "Remove-Item -Recurse -Force ./pre-install/*.tgz"
-powershell -Command "Remove-Item -Recurse -Force ./extensions/*/*.tgz"
-powershell -Command "Remove-Item -Recurse -Force ./electron/pre-install/*.tgz"
-powershell -Command "if (Test-Path \"$($env:USERPROFILE)\jan\extensions\") { Remove-Item -Path \"$($env:USERPROFILE)\jan\extensions\" -Recurse -Force }"
else ifeq ($(shell uname -s),Linux)
find . -name "node_modules" -type d -prune -exec rm -rf '{}'
find . -name ".next" -type d -exec rm -rf '{}'
find . -name "dist" -type d -exec rm -rf '{}'
find . -name "build" -type d -exec rm -rf '{}'
find . -name "out" -type d -exec rm -rf '{}'
find . -name ".turbo" -type d -exec rm -rf '{}'
find . -name "packake-lock.json" -type f -exec rm -rf '{}'
find . -name "yarn.lock" -type f -exec rm -rf '{}'
rm -rf ./pre-install/*.tgz
rm -rf ./extensions/*/*.tgz
rm -rf ./electron/pre-install/*.tgz
rm -rf "~/jan/extensions"
rm -rf "~/.cache/jan*"
Expand All @@ -75,8 80,11 @@ else
find . -name "dist" -type d -exec rm -rf '{}'
find . -name "build" -type d -exec rm -rf '{}'
find . -name "out" -type d -exec rm -rf '{}'
find . -name ".turbo" -type d -exec rm -rf '{}'
find . -name "packake-lock.json" -type f -exec rm -rf '{}'
find . -name "yarn.lock" -type f -exec rm -rf '{}'
rm -rf ./pre-install/*.tgz
rm -rf ./extensions/*/*.tgz
rm -rf ./electron/pre-install/*.tgz
rm -rf ~/jan/extensions
rm -rf ~/Library/Caches/jan*
Expand Down
6 changes: 4 additions & 2 deletions extensions/turbo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 2,12 @@
"$schema": "https://turbo.build/schema.json",
"pipeline": {
"build": {
"outputs": [".dist/**", "*.tgz"]
"dependsOn": ["^build"],
"outputs": ["dist/**"]
},
"build:publish": {
"dependsOn": ["^build"]
"dependsOn": ["build"],
"outputs": ["**.tgz"]
},
"dev": {
"cache": false
Expand Down
Loading
Loading