JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

web/{multinode,satellite,storagenode}: revert go.mod

Browse Source 
Adding go.mod into node_modules is not sufficient, because npm install
wipes them quite often out. Similarly, when running npm install locally
it will remove it, causing the git state to be dirty.

Rather than having them committed, add them after running npm install.

Change-Id: Iaf21a9c6e198dc31fe50345ec5dee85b44617176
This commit is contained in:
Egon Elbre 2022-07-08 19:49:21 +03:00
parent c3171b4ba4
commit 15dc797efd
10 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile.premerge
View File

@ -59,6 +59,7 @@ pipeline {
steps {
dir('web/satellite') {
sh 'npm install --prefer-offline --no-audit --loglevel silly'
sh 'touch ./node_modules/go.mod' // prevent Go from scanning this dir
sh './scripts/build-wasm.sh'
sh 'npm run build'
}
@ -68,6 +69,7 @@ pipeline {
steps {
dir('web/storagenode') {
sh 'npm install --prefer-offline --no-audit --loglevel silly'
sh 'touch ./node_modules/go.mod' // prevent Go from scanning this dir
sh 'npm run build'
}
}
@ -76,6 +78,7 @@ pipeline {
steps {
dir('web/multinode') {
sh 'npm install --prefer-offline --no-audit --loglevel silly'
sh 'touch ./node_modules/go.mod' // prevent Go from scanning this dir
sh 'npm run build'
}
}
@ -84,6 +87,7 @@ pipeline {
steps {
dir('satellite/admin/ui') {
sh 'npm install --prefer-offline --no-audit --loglevel silly'
sh 'touch ./node_modules/go.mod' // prevent Go from scanning this dir
sh 'npm run build'
}
}

4
Jenkinsfile.verify
View File

@ -104,6 +104,7 @@ pipeline {
steps {
dir('web/satellite') {
sh 'npm install --prefer-offline --no-audit --loglevel silly'
sh 'touch ./node_modules/go.mod' // prevent Go from scanning this dir
sh './scripts/build-wasm.sh'
sh 'npm run build'
@ -127,6 +128,7 @@ pipeline {
steps {
dir("web/storagenode") {
sh 'npm install --prefer-offline --no-audit --loglevel silly'
sh 'touch ./node_modules/go.mod' // prevent Go from scanning this dir
sh 'npm run build'
sh 'npm run lint-ci'
sh script: 'npm audit', returnStatus: true
@ -142,6 +144,7 @@ pipeline {
steps {
dir("web/multinode") {
sh 'npm install --prefer-offline --no-audit --loglevel silly'
sh 'touch ./node_modules/go.mod' // prevent Go from scanning this dir
sh 'npm run build'
sh 'npm run lint-ci'
sh script: 'npm audit', returnStatus: true
@ -157,6 +160,7 @@ pipeline {
steps {
dir("satellite/admin/ui") {
sh 'npm install --prefer-offline --no-audit --loglevel silly'
sh 'touch ./node_modules/go.mod' // prevent Go from scanning this dir
sh 'npm run build'
sh script: 'npm audit', returnStatus: true
sh 'npm run check'

5
satellite/admin/ui/.gitignore vendored
View File

@ -5,7 +5,4 @@ node_modules
/.svelte-kit
/package
.env
.env.*
# Stub for Go to avoid scanning node_modules.
!node_modules/go.mod
.env.*

5
satellite/admin/ui/node_modules/go.mod vendored
View File

@ -1,5 +0,0 @@
module storj.io/storj/satellite/admin/ui/node_modules
go 1.17
// Stub module to prevent Go from scanning node_modules directory.

5
web/multinode/.gitignore vendored
View File

@ -23,7 +23,4 @@ yarn-error.log*
*.ntvs*
*.njsproj
*.sln
*.sw*
# Stub for Go to avoid scanning node_modules.
!node_modules/go.mod
*.sw*

5
web/multinode/node_modules/go.mod vendored
View File

@ -1,5 +0,0 @@
module storj.io/storj/web/multinode/node_modules
go 1.17
// Stub module to prevent Go from scanning node_modules directory.

5
web/satellite/.gitignore vendored
View File

@ -29,7 +29,4 @@ yarn-error.log*
*.ntvs*
*.njsproj
*.sln
*.sw*
# Stub for Go to avoid scanning node_modules.
!node_modules/go.mod
*.sw*

5
web/satellite/node_modules/go.mod vendored
View File

@ -1,5 +0,0 @@
module storj.io/storj/web/satellite/node_modules
go 1.17
// Stub module to prevent Go from scanning node_modules directory.

5
web/storagenode/.gitignore vendored
View File

@ -23,7 +23,4 @@ yarn-error.log*
*.ntvs*
*.njsproj
*.sln
*.sw*
# Stub for Go to avoid scanning node_modules.
!node_modules/go.mod
*.sw*

5
web/storagenode/node_modules/go.mod vendored
View File

@ -1,5 +0,0 @@
module storj.io/storj/web/storagenode/node_modules
go 1.17
// Stub module to prevent Go from scanning node_modules directory.