Skip to content

Commit 7a5c4ee

Browse files
committed
New script layout
1 parent 9e2dae3 commit 7a5c4ee

File tree

5 files changed

+18
-5
lines changed

5 files changed

+18
-5
lines changed

scripts/jobs/scala-release-2.11.x-unix renamed to scripts/jobs/release/package/unix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
# to be extra-sure we don't pollute
44
rm -rf $WORKSPACE/.ivy2
55

6-
. scripts/scala-release-2.11.x-pkg
6+
. scripts/jobs/release/package/generic

scripts/jobs/scala-release-2.11.x-windows renamed to scripts/jobs/release/package/windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
# to be extra-sure we don't pollute
44
rm -rf "$(/usr/bin/cygpath --unix $WORKSPACE/.ivy2)"
55

6-
. scripts/scala-release-2.11.x-pkg
6+
. scripts/jobs/release/package/generic

scripts/jobs/scala-release-2.11.x-scala-lang renamed to scripts/jobs/release/website/archives

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,3 @@ for m in $modules; do
3434
ssh "${sshCharaArgs[@]}" "(set -x; cd $archivesDir && mkdir -p api/$version/$m && unzip \$(find api/$version/jars -name ${m}_'*javadoc.jar' -o -name ${m}-${version}-javadoc.jar) -d api/$version/$m;)"
3535
done
3636

37-
echo "Symlinking api/$version to api/2.11.x."
38-
39-
ssh "${sshCharaArgs[@]}" "cd $archivesDir/api/ ; [[ -d $version ]] && ln -sfn $version 2.11.x"
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/bash -ex
2+
# need to re-declare it as an array, not sure how to do that directly in jenkins
3+
declare -a sshCharaArgs="$sshCharaArgs"
4+
5+
if [[ "$version" =~ .*-nightly ]]
6+
then archivesDir="~linuxsoft/archives/scala/nightly/2.11.x"
7+
else archivesDir="~linuxsoft/archives/scala"
8+
fi
9+
10+
echo "Symlinking $archivesDir/api/$version to $archivesDir/api/2.11.x."
11+
12+
ssh "${sshCharaArgs[@]}" "cd $archivesDir/api/ ; [[ -d $version ]] && ln -sfn $version 2.11.x"
13+
14+
# needs to run once on new major release:
15+
# ssh "${sshCharaArgs[@]}" "cd $archivesDir/api/ ; [[ -d $version ]] && ln -sfn 2.11.x current"
16+

0 commit comments

Comments
 (0)