Skip to content

Fix PGP signing #2444

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

Merged
merged 3 commits into from
May 17, 2017
Merged

Fix PGP signing #2444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3388ca
Re-enable singleton type assertion in erasure
felixmulder May 16, 2017
b7d1034
Move linking to sbt script
felixmulder May 16, 2017
6d9ea4a
Remove aliases and add NIGHTLYBUILD=yes to publish script
felixmulder May 17, 2017
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 .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ pipeline:
image: lampepfl/dotty:24-04-2017
pull: true
commands:
- ln -s /var/cache/drone/ivy2 "$HOME/.ivy2"
- ./project/scripts/sbt "${CI_TEST}"
when:
branch:
Expand Down
4 changes: 1 addition & 3 deletions compiler/src/dotty/tools/dotc/transform/Erasure.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,7 @@ object Erasure extends TypeTestsCasts{
* in ExtensionMethods#transform.
*/
def cast(tree: Tree, pt: Type)(implicit ctx: Context): Tree = {
// TODO: The commented out assertion fails for tailcall/t6574.scala
// Fix the problem and enable the assertion.
// assert(!pt.isInstanceOf[SingletonType], pt)
assert(!pt.isInstanceOf[SingletonType], pt)
if (pt isRef defn.UnitClass) unbox(tree, pt)
else (tree.tpe, pt) match {
case (JavaArrayType(treeElem), JavaArrayType(ptElem))
Expand Down
4 changes: 4 additions & 0 deletions project/scripts/sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ else
fi

if [ $SHOULD_RUN = true ]; then
# get the ivy2 cache:
ln -s /var/cache/drone/ivy2 "$HOME/.ivy2" || true

# run sbt with the supplied arg:
sbt -J-Xmx4096m \
-J-XX:ReservedCodeCacheSize=512m \
-J-XX:MaxMetaspaceSize=1024m \
Expand Down
9 changes: 4 additions & 5 deletions project/scripts/sbtPublish
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,20 @@ if [ $SHOULD_RUN = false ]; then
exit 0
fi

if [ -z "$SONATYPE_USER" -o -z "$SONATYPE_PW" -o -z "$PGP_PW" ]; then
if [ -z "$2" -o -z "$3" -o -z "$4" ]; then
echo "invalid args: this script takes 4 args, usage:"
echo ""
echo " ./project/scripts/sbt SHOULD_RUN SONATYPE_USER SONATYPE_PW PGP_PW"
exit 1
fi

CMD=' ;set credentials += Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", "'"$SONATYPE_USER"'", "'"$SONATYPE_PW"'")'
CMD="$CMD ;set pgpPassphrase := Some(\"\"\"$PGP_PW\"\"\".toCharArray)"
CMD=' ;set credentials += Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", "'"$2"'", "'"$3"'")'
CMD="$CMD ;set pgpPassphrase := Some(\"\"\"$4\"\"\".toCharArray)"
CMD="$CMD ;set pgpSecretRing := file(\"/keys/secring.asc\")"
CMD="$CMD ;set pgpPublicRing := file(\"/keys/pubring.asc\")"
CMD="$CMD ;dotty-bootstrapped/publishSigned ;sonatypeRelease"

echo "Will run sbt with command: \"$CMD\""

export NIGHTLYBUILD="yes"
sbt -J-Xmx4096m \
-J-XX:ReservedCodeCacheSize=512m \
-J-XX:MaxMetaspaceSize=1024m \
Expand Down