Changeset 79b39d0 in mainline

Timestamp:

2018-09-05T19:53:11Z (6 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

954c024

Parents:

848740c9

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-09-05 02:14:20)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-09-05 19:53:11)

Message:

Download travis toolchain from Amazon S3 for now

Also a few minor changes to the script.
The toolchain I uploaded is not static. Instead it's built in virtualized
Ubuntu Trusty using a modified toolchain.sh with size optimizations enabled.
The resulting archive is a lot smaller than the static-link version.
The modified script is downloadable from the same path as the archives
(named "toolchain.sh" as usual).

Ask me for write access to the bucket if you need/want it.

Files:

• .travis.yml (modified) (3 diffs)
• tools/travis.sh (modified) (2 diffs)

.travis.yml

@@ -35 +35 @@
 
 language: c
+dist: trusty
 sudo: required
 env:
   global:
-    - CROSS_PREFIX=/usr/local/cross-static/
+    - CROSS_PREFIX=/usr/local/cross
   matrix:
     - H_CCHECK=true
@@ -57 +58 @@
     - H_ARCH=sparc64/ultra
 before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq genisoimage
   - ./tools/travis.sh install
 script:
@@ -66 +69 @@
     channels:
       - "chat.freenode.net#helenos"
-    use_notice: true
+    use_notice: false
     skip_join: true
     template:

tools/travis.sh

@@ -104 +104 @@
 fi
 
-
-# Custom CROSS_PREFIX
-if [ ."$CROSS_PREFIX" == . ]; then
-        export CROSS_PREFIX=/usr/local/cross-static/
-fi
-
 # Default Harbours repository
 if [ -z "$H_HARBOURS_REPOSITORY" ]; then
@@ -135 +129 @@
     set -x
 
-    # Install dependencies
-    sudo apt-get -qq update || exit 1
-    sudo apt-get install -y genisoimage || exit 1
-
     # Fetch and install cross-compiler
-    wget "http://ci.helenos.org/download/helenos-cross-$H_CROSS_TARGET.static.tar.xz" -O "/tmp/cross-$H_CROSS_TARGET.static.tar.xz" || exit 1
-    sudo mkdir -p "$CROSS_PREFIX" || exit 1
-    sudo tar -xJ -C "$CROSS_PREFIX" -f "/tmp/cross-$H_CROSS_TARGET.static.tar.xz" || exit 1
+    wget "https://helenos.s3.amazonaws.com/toolchain/$H_CROSS_TARGET.tar.xz" -O "/tmp/$H_CROSS_TARGET.tar.xz" || exit 1
+    sudo tar -xJ -C "/" -f "/tmp/$H_CROSS_TARGET.tar.xz" || exit 1
     exit 0
-
 
 elif [ "$1" = "run" ]; then