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

[JENKINS-68699] Upgrade Yarn from 1.22.19 to 3.2.0 #5824

Merged
merged 14 commits into from
Jul 21, 2022
Merged

[JENKINS-68699] Upgrade Yarn from 1.22.19 to 3.2.0 #5824

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8664aad
upgrade to npm and yarn 3.0
StefanSpieker Oct 16, 2021
131cf93
install latest yarn 1.0
StefanSpieker Oct 16, 2021
7c73775
install latest yarn 1.22
StefanSpieker Oct 16, 2021
ffe187e
set git attributes for yarn 3.0
StefanSpieker Oct 16, 2021
8c55684
add comment why yarn 1.x is installed although 3.0 is used
StefanSpieker Oct 30, 2021
7d073d3
Merge remote-tracking branch 'origin/master' into yarn-3.0
basil Apr 15, 2022
45f5286
Bump versions yet again
basil Apr 16, 2022
f9d1e86
Update gitignore files
basil Apr 16, 2022
4611260
Update yarn berry
basil Apr 16, 2022
7935ca5
Add comments
basil Apr 16, 2022
410c54f
Update yarn.lock
basil Apr 16, 2022
a73660a
Merge remote-tracking branch 'origin/master' into yarn-3.0
basil Jul 20, 2022
b54f044
Fetch Yarn Berry using Ant
basil Jul 20, 2022
c1aaf3d
Merge remote-tracking branch 'origin/master' into yarn-3.0
basil Jul 21, 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
2 changes: 2 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,5 @@
*.png binary
*.war binary
*.zip binary
/war/.yarn/releases/** binary
/war/.yarn/plugins/** binary
9 changes: 9 additions & 0 deletions war/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@ work
/rebel.xml
junit.xml

# yarn
.yarn/*
!.yarn/cache
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions

# Node
node/
node_modules/
Expand Down
631 changes: 631 additions & 0 deletions war/.yarn/releases/yarn-berry.cjs
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions war/.yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-berry.cjs
7 changes: 2 additions & 5 deletions war/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ THE SOFTWARE.
<contextPath>/jenkins</contextPath><!-- context path during test -->
<host>localhost</host><!-- HTTP listener host/interface -->
<port>8080</port><!-- HTTP listener port -->
<node.version>14.16.0</node.version>
<yarn.version>1.22.10</yarn.version>
<node.version>14.18.1</node.version>
<yarn.version>1.22.15</yarn.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -588,9 +588,6 @@ THE SOFTWARE.
<goal>yarn</goal>
</goals>
<configuration>
<!-- ensure only one concurrent 'yarn install' -->
<!-- when yarn cache is empty, multiple yarns performing network fetches frequently results in opaque errors -->
<arguments>--mutex network</arguments>
</configuration>
</execution>

Expand Down
Loading