Browse Source

Move the JDK Building into the pre-deployment so it's only done for releases, this makes regular compiles faster and prevents builds from failing when oracle changes it's urls again (like they seem to do every two months at least)

MeFisto94 7 years ago
parent
commit
7f08316626
1 changed files with 7 additions and 5 deletions
  1. 7 5
      .travis.yml

+ 7 - 5
.travis.yml

@@ -44,11 +44,6 @@ install:
   # Remove Engine Source and built class files since travis is low on disk space
   # Remove Engine Source and built class files since travis is low on disk space
   - rm -rf engine/
   - rm -rf engine/
   - ./gradlew buildSdk
   - ./gradlew buildSdk
-  - cd jdks
-  - ./download-jdks.sh
-  # Reduce Diskspace by 3G
-  - rm -rf jdks/local/*/{downloads,linux-i586,linux-x64,windows-i586,windows-x64}
-  - cd ../
   #- '[ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && ant -Dstorepass="$NBM_SIGN_PASS" hudson-nightly | awk "{printf(\".\"); fflush(stdout)}" || :'
   #- '[ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && ant -Dstorepass="$NBM_SIGN_PASS" hudson-nightly | awk "{printf(\".\"); fflush(stdout)}" || :'
   #- '[ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && scp -rp -i nbproject/private/www-updater.key build/updates/* [email protected]:/var/www/updates/nightly/3.1/plugins || :'
   #- '[ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && scp -rp -i nbproject/private/www-updater.key build/updates/* [email protected]:/var/www/updates/nightly/3.1/plugins || :'
   
   
@@ -61,6 +56,13 @@ before_deploy:
   # the above gradlew already sets the correct ant properties to build
   # the above gradlew already sets the correct ant properties to build
   # Include suite.nbms again, when we upload nbms again.
   # Include suite.nbms again, when we upload nbms again.
   
   
+  # Build the JDKs we package
+  - cd jdks
+  - ./download-jdks.sh
+  # Reduce Diskspace by 3G
+  - rm -rf jdks/local/*/{downloads,linux-i586,linux-x64,windows-i586,windows-x64}
+  - cd ../
+  
   # Force Freeing Space.
   # Force Freeing Space.
   - rm -rf build/
   - rm -rf build/
   - ant -Dstorepass="$NBM_SIGN_PASS" -Dpack200.enabled=true set-spec-version build-installers unset-spec-version | awk '{printf("."); fflush(stdout)}'
   - ant -Dstorepass="$NBM_SIGN_PASS" -Dpack200.enabled=true set-spec-version build-installers unset-spec-version | awk '{printf("."); fflush(stdout)}'