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.

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

Testing ignore script - RSC-980 #704

Draft
wants to merge 35 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
c741a31
Testing ignore-script. - RSC-980
Apr 19, 2022
d82ae80
Bumped versions. - RSC-980
Apr 19, 2022
672d48a
Added yarn rebuild. - RSC-980
Apr 21, 2022
91ae2d0
Merge branch 'main' into RSC-980_ignore-script
Apr 21, 2022
35c5ea0
Updated versions. - RSC-980
Apr 21, 2022
3d0d3ea
Added update yarn. - RSC-980
Apr 21, 2022
6f5fd2d
Updated Dockerfile to update yarn - RSC-980
Apr 21, 2022
ead0d2f
Updated to yarn 2 configs. - RSC-980
Apr 21, 2022
23e7e98
Fixed yaml. - RSC-980
Apr 21, 2022
48dd3a9
Updated yarnrc. - RSC-980
Apr 21, 2022
7e65adc
Removed ignore-scripts. - rSC-980
Apr 21, 2022
1eaecd2
Used CI=true. - RSC-980
Apr 21, 2022
1435959
Updated lock. - RSC-980
Apr 21, 2022
f59e5ea
Disabled IMMUTABLE installs. - RSC-980
Apr 21, 2022
b34cd50
Enable build for rsc. - RSC-980
Apr 21, 2022
dcfb502
Reverted yarn.lock. - RSC-980
Apr 22, 2022
abe6243
Updated package and lock to newer version. - RSC-980
Apr 22, 2022
a495a26
Fixed conflicts. - RSC-980
Apr 22, 2022
aa97e56
Progress. - RSC-980
Apr 25, 2022
bfecf8a
Removed .yarn from git. - RSC-980
Apr 25, 2022
e5e3975
Fixed yarn 2 issues. - RSC-980
Apr 25, 2022
d4d5181
Removed yarn cache. - RSC-980
Apr 26, 2022
1c40015
Added releases back into .yarn. - RSC-980
Apr 26, 2022
bfe7314
Added README.md and git attributes. - RSC-980
Apr 26, 2022
b35b3e0
Added README.md and git attributes. - RSC-980
Apr 26, 2022
71b7522
Disabled IMMUTABLE installs. - RSC-980
Apr 26, 2022
190825b
Updated yarn.lock and added --immutable. - RSC-980
Apr 26, 2022
eef981b
Used yarn config to set registry. Disable immutable installs. - RSC-980
Apr 26, 2022
bbf7055
Updated ssr lock. - RSC-980
Apr 26, 2022
d93c19d
Fixed Jenkinsfile. - RSC-980
Apr 26, 2022
dfa98cb
Disable immutable installs again. - RSC-980
Apr 26, 2022
601b671
Updated gallery lock. - RSC-980
Apr 26, 2022
0e55590
Added immutable to ssr ops. - RSC-980
Apr 26, 2022
9d85493
Allow mutate lock for gallery. - RSC-980
Apr 26, 2022
2b1c31b
Updated SSR install. - RSC-980
Apr 26, 2022
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: 0 additions & 1 deletion .yarnrc

This file was deleted.

5 changes: 5 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
enableScripts: false

nodeLinker: "node-modules"

npmRegistryServer: "https://registry.npmjs.org"
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ RUN apt-get update && \
RUN useradd -u 1002 -g 100 jenkins
RUN mkdir -p /home/jenkins/.npm
Copy link

Choose a reason for hiding this comment

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

DL3059: Multiple consecutive RUN instructions. Consider consolidation.

(at-me in a reply with help or ignore)


Was this a good recommendation?
[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]

Copy link

Choose a reason for hiding this comment

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

DL3059: Multiple consecutive RUN instructions. Consider consolidation.

(at-me in a reply with help or ignore)


Was this a good recommendation?
[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]

Copy link

Choose a reason for hiding this comment

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

DL3059: Multiple consecutive RUN instructions. Consider consolidation.

(at-me in a reply with help or ignore)


Was this a good recommendation?
[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]

Copy link

Choose a reason for hiding this comment

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

DL3059: Multiple consecutive RUN instructions. Consider consolidation.

(at-me in a reply with help or ignore)


Was this a good recommendation?
[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]

Copy link

Choose a reason for hiding this comment

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

DL3059: Multiple consecutive RUN instructions. Consider consolidation.

(at-me in a reply with help or ignore)


Was this a good recommendation?
[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]

Copy link

Choose a reason for hiding this comment

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

DL3059: Multiple consecutive RUN instructions. Consider consolidation.

(at-me in a reply with help or ignore)


Was this a good recommendation?
[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]

Copy link

Choose a reason for hiding this comment

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

DL3059: Multiple consecutive RUN instructions. Consider consolidation.

(at-me in a reply with help or ignore)


Was this a good recommendation?
[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]

Copy link

Choose a reason for hiding this comment

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

DL3059: Multiple consecutive RUN instructions. Consider consolidation.

(at-me in a reply with help or ignore)


Was this a good recommendation?
[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]

Copy link

Choose a reason for hiding this comment

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

DL3059: Multiple consecutive RUN instructions. Consider consolidation.

(at-me in a reply with help or ignore)


Was this a good recommendation?
[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]

Copy link

Choose a reason for hiding this comment

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

DL3059: Multiple consecutive RUN instructions. Consider consolidation.

(at-me in a reply with help or ignore)


Was this a good recommendation?
[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]

Copy link

Choose a reason for hiding this comment

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

DL3059: Multiple consecutive RUN instructions. Consider consolidation.

(at-me in a reply with help or ignore)


Was this a good recommendation?
[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]

Copy link

Choose a reason for hiding this comment

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

DL3059: Multiple consecutive RUN instructions. Consider consolidation.

(at-me in a reply with help or ignore)


Was this a good recommendation?
[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]

Copy link

Choose a reason for hiding this comment

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

DL3059: Multiple consecutive RUN instructions. Consider consolidation.

(at-me in a reply with help or ignore)


Was this a good recommendation?
[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]

RUN chown -R jenkins /home/jenkins/

RUN yarn set version berry
6 changes: 3 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -83,22 +83,22 @@ dockerizedBuildPipeline(
registry=https://repo.sonatype.com/repository/npm-all/

cd lib
yarn install --registry "\${registry}" --frozen-lockfile
CI=TRUE yarn install --registry "\${registry}" --immutable
yarn test
yarn build
cd dist
npm pack
cd ../..

cd gallery
yarn install --registry "\${registry}" --frozen-lockfile
YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install --registry "\${registry}"

yarn test
yarn build
cd ..

cd ssr-tests
yarn install --registry "\${registry}" --frozen-lockfile
YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install --registry "\${registry}"

# Run the server-side rendering tests, through docker similarly to the visual tests
TEST_IP=\$JENKINS_AGENT_IP NEXT_TELEMETRY_DISABLED=1 yarn test
Expand Down
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,14 @@ The RSC code is split into two separate codebases: the library itself which live
## Building

### Required Software
Node 10.x or 12.x. Node 14.x is known not to work currently.
yarn 1.21.1
<!-- Node 10.x or 12.x. Node 14.x is known not to work currently. -->
Node 12.x
Comment on lines +153 to +154
Copy link
Contributor

Choose a reason for hiding this comment

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

This is out of date even before this PR. We're on Node 16 now and also support 14

yarn 3.2

Go to lib/ or/and gallery/ directory and run:
`yarn set version berry`

You must run `yarn install` each time you switch between branches.

### Installation of Dependencies
In the lib/ directory, run `yarn install`
Expand Down
2 changes: 2 additions & 0 deletions gallery/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/.yarn/releases/** binary
/.yarn/plugins/** binary
8 changes: 8 additions & 0 deletions gallery/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,11 @@ node_modules
dist
webpack-modules
test-results

.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
785 changes: 785 additions & 0 deletions gallery/.yarn/releases/yarn-3.2.0.cjs

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions gallery/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
enableScripts: false

nodeLinker: node-modules

npmRegistryServer: "https://registry.npmjs.org"

yarnPath: .yarn/releases/yarn-3.2.0.cjs
15 changes: 11 additions & 4 deletions gallery/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sonatype/react-shared-components-gallery",
"version": "10.0.5",
"version": "10.0.6",
"description": "Gallery application to demonstrate usage and look of Sonatype shared UI components",
"main": "src/main.ts",
"scripts": {
Expand All @@ -12,7 +12,7 @@
"webpack": "webpack --env production --mode=production",
"webpack-dev-server": "webpack serve",
"test": "npm-run-all check-install lint-tests build jest",
"check-install": "yarn install --check-files --frozen-lockfile",
"check-install": "yarn install --check-cache --immutable",
"jest": "jest --testTimeout=120000",
"clean": "rimraf dist webpack-modules test-results"
},
Expand Down Expand Up @@ -68,19 +68,26 @@
"@fortawesome/free-solid-svg-icons": "^5.15.4",
"@fortawesome/react-fontawesome": "^0.1.14",
"@react-hook/debounce": "^4.0.0",
"@sonatype/react-shared-components": "link:../lib/dist",
"@sonatype/react-shared-components": "../lib/dist",
"axios": "^0.21.1",
"classnames": "^2.2.6",
"compare-versions": "^4.1.3",
"core-js": "^3.8.3",
"es6-object-assign": "^1.1.0",
"es6-set": "^0.1.5",
"link": "^1.4.0",
Copy link
Contributor

Choose a reason for hiding this comment

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

What's this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

What's this?

Oh I meant to remove that!

"query-string": "^6.13.8",
"ramda": "^0.28.0",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"react-syntax-highlighter": "^15.4.3"
}
},
"dependenciesMeta": {
"puppeteer": {
"built": true
}
},
"packageManager": "[email protected]"
}
Loading