diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index e3506ac4e4024..0000000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,86 +0,0 @@ -version: 2 -workflows: - version: 2 - linux-builds: - jobs: - - build-i686 - - build-x86_64 - -jobs: - build-i686: - docker: - - image: circleci/python:2.7 - environment: - ARCH: i686 - JULIA_CPU_THREADS: 4 - JULIA_TEST_MAXRSS_MB: 800 - steps: &steps - - run: | # install build dependencies - sudo apt-get install -y g++-6-multilib gfortran-6-multilib \ - time ccache bar && - for prog in gcc g++ gfortran; do - sudo ln -s /usr/bin/$prog-6 /usr/local/bin/$prog; - done - - checkout # circle ci code checkout step -# (FIXME: need to unset url."ssh://git@github.com".insteadOf or libgit2 tests fail) - - run: | # checkout merge commit, set versioning info and Make.user variables - git config --global --unset url."ssh://git@github.com".insteadOf && - if [ -n "$CIRCLE_PULL_REQUEST" ]; then - git remote set-url origin git@github.com:JuliaLang/julia.git && - git fetch origin +refs/pull/$(basename $CIRCLE_PULL_REQUEST)/merge && - git checkout -qf FETCH_HEAD; - fi && - make -C base version_git.jl.phony && - echo "override ARCH = $ARCH" | tee -a Make.user && - for var in FORCE_ASSERTIONS LLVM_ASSERTIONS USECCACHE NO_GIT; do - echo "override $var = 1" | tee -a Make.user; - done && - echo "$ARCH $HOME $(date +%Y%W)" | tee /tmp/weeknumber - - restore_cache: # silly to take a checksum of the tag file here instead of - keys: # its contents but this is the only thing that works on circle - - ccache-{{ arch }}-{{ checksum "/tmp/weeknumber" }} - - run: | # compile julia deps - contrib/download_cmake.sh && - make -j3 -C deps || make - - run: | # build julia, output ccache stats when done - make -j3 release && - make prefix=/tmp/julia install && - ccache -s && - make build-stats - - run: | # move source tree out of the way, run tests from install tree - COMMIT_RANGE=$(echo "${CIRCLE_COMPARE_URL}" | cut -d/ -f7) && - [[ "$COMMIT_RANGE" != *"..."* ]] && COMMIT_RANGE="${COMMIT_RANGE}...${COMMIT_RANGE}"; - FILES_CHANGED=$(git diff --name-only $COMMIT_RANGE -- || git ls-files) && - cd .. && - mv project julia-src && - /tmp/julia/bin/julia -e 'Base.require(Main, :InteractiveUtils).versioninfo()' && - /tmp/julia/bin/julia --sysimage-native-code=no -e 'true' && - #/tmp/julia/bin/julia-debug --sysimage-native-code=no -e 'true' && - pushd /tmp/julia/share/julia/test && - if [ $(echo "$FILES_CHANGED" | grep -cv '^doc/') -gt 0 ]; then - /tmp/julia/bin/julia --check-bounds=yes runtests.jl all --skip Sockets | bar -i 30 && - /tmp/julia/bin/julia --check-bounds=yes runtests.jl LibGit2/online Pkg/pkg download; - fi && - popd && - mkdir /tmp/embedding-test && - make check -C /tmp/julia/share/julia/test/embedding \ - JULIA=/tmp/julia/bin/julia BIN=/tmp/embedding-test \ - "$(cd julia-src && make print-CC)" && - mv julia-src project -# - run: cd project && make -C doc deploy - - run: - command: sudo dmesg - when: on_fail - - save_cache: - key: ccache-{{ arch }}-{{ checksum "/tmp/weeknumber" }} - paths: - - ~/.ccache - - build-x86_64: - docker: - - image: circleci/python:2.7 - environment: - ARCH: x86_64 - JULIA_CPU_THREADS: 4 - JULIA_TEST_MAXRSS_MB: 800 - steps: *steps diff --git a/.freebsdci.sh b/.freebsdci.sh deleted file mode 100755 index 399ba8e92db2d..0000000000000 --- a/.freebsdci.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh -# FreeBSD CI Build Scripts -# The flow of a FreeBSD CI (https://freebsdci.julialang.org) build: -# -# 1. `cleanup` -# 2. `compile` -# 3. `build-state` -# 4. `runtests` -# 5. `test-embedding` -# -# Detail of flow is controlled by the variable `factory` -# here. -# https://github.com/iblis17/julia-fbsd-buildbot/blob/master/master/master.cfg -# -# Usage: .freebsdci.sh - -set -xe - -build-state(){ - gmake build-stats -} - -cleanup(){ - git clean -fdx -} - -compile(){ - export MALLOC_CONF='junk:false' - export VERBOSE=1 - export FORCE_ASSERTIONS=1 - export LLVM_ASSERTIONS=1 - export USECCACHE=1 - - gmake check-whitespace - gmake release -j $MAKE_JOBS_NUMBER -} - -runtests(){ - export MALLOC_CONF='junk:false' - export VERBOSE=1 - export FORCE_ASSERTIONS=1 - export LLVM_ASSERTIONS=1 - export JULIA_TEST_MAXRSS_MB=600 - export JULIA_CPU_THREADS=$MAKE_JOBS_NUMBER - - ./usr/bin/julia --check-bounds=yes test/runtests.jl all - ./usr/bin/julia --check-bounds=yes test/runtests.jl \ - LibGit2/online Pkg/pkg download -} - -test-embedding(){ - export JULIA='../../julia' - export BIN='../../tmp' - - mkdir -vp tmp - gmake -C test embedding -} - - -if [ -z $1 ] -then - exit 1 -fi - -$1 diff --git a/contrib/README.md b/contrib/README.md index 734b24cfed507..aacef59415921 100644 --- a/contrib/README.md +++ b/contrib/README.md @@ -19,7 +19,6 @@ Installation |[ repackage_system_suitesparse4.make ](https://github.com/JuliaLang/julia/blob/master/contrib/repackage_system_suitesparse4.make) | Links shared libraries from static-library for suitesparse4 | |[ stringreplace.c ](https://github.com/JuliaLang/julia/blob/master/contrib/stringreplace.c) | Replace strings to hardcoded paths in binaries during `make install` | |[ travis_fastfail.sh ](https://github.com/JuliaLang/julia/blob/master/contrib/travis_fastfail.sh ) | Checks for queued build tests in Travis | -|[ vagrant/ ](https://github.com/JuliaLang/julia/blob/master/contrib/vagrant/) | Portable development environment Vagrant install files | |[ windows/ ](https://github.com/JuliaLang/julia/blob/master/contrib/windows/) | Windows install files | Editors + Debuggers diff --git a/contrib/README.ackrc.txt b/contrib/ack/README.md similarity index 100% rename from contrib/README.ackrc.txt rename to contrib/ack/README.md diff --git a/contrib/ackrc b/contrib/ack/ackrc similarity index 100% rename from contrib/ackrc rename to contrib/ack/ackrc diff --git a/contrib/vagrant/README.md b/contrib/vagrant/README.md deleted file mode 100644 index c5e02b8855105..0000000000000 --- a/contrib/vagrant/README.md +++ /dev/null @@ -1,43 +0,0 @@ -## Developing Julia with Vagrant - -Vagrant is a system that creates lightweight, self-contained development -environments as virtual machines. This directory contains a Vagrantfile which -will provision a headless 64-bit Ubuntu 12.04 Precise Pangolin virtual machine -on VirtualBox for building Julia. - -### Requirements - -To develop under Vagrant, you will first need to install [Oracle -VirtualBox](https://www.virtualbox.org/wiki/Downloads) and -[Vagrant](http://downloads.vagrantup.com/). Then, from a command line, enter -the `contrib/vagrant` directory, and enter: - -``` -$ vagrant up -``` - -A virtual machine will be downloaded if needed, created, and provisioned with -the dependencies to build Julia. By default, it exposes an SSH server to your -local machine on port 2222. See the [Vagrant -documentation](http://docs.vagrantup.com/v2/) for complete details on using -Vagrant. - -### Building Julia - -Before attempting to build Julia from the Vagrant machine, you must ensure that -submodules have been initialized and are up to date. On the host system, from -the top level Julia repository directory, run: - -``` -$ git submodule init -$ git submodule update -``` - -The Julia repository is exposed to the VM using a VirtualBox shared folder as -`~/julia`. To speed up the build process and handle some limitations of -VirtualBox shared folders, the contents of the julia-dependencies PPA are -downloaded during provisioning. To take advantage of these dependencies, use -the `jlmake` alias in place of `make`. - -When the build is complete, you can run -`~/julia/usr/bin/julia` to start Julia. diff --git a/contrib/vagrant/Vagrantfile b/contrib/vagrant/Vagrantfile deleted file mode 100644 index a693cd81235e1..0000000000000 --- a/contrib/vagrant/Vagrantfile +++ /dev/null @@ -1,51 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -$script = <