Skip to content

Commit

Permalink
Merge branch 'master' into in-place-kron
Browse files Browse the repository at this point in the history
  • Loading branch information
Roger-luo committed May 6, 2020
2 parents ee196f8 + 5c5ab49 commit edb7d49
Show file tree
Hide file tree
Showing 1,805 changed files with 84,616 additions and 53,175 deletions.
65 changes: 65 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
environment:
global:
CCACHE_DIR: C:\ccache
CYG_MIRROR: http://cygwin.mirror.constant.com
CYG_CACHE: '%CYG_ROOT%\var\cache\setup'
CYG_BASH: '%CYG_ROOT%\bin\bash'

matrix:
- MINGW_ARCH: "i686"
CYG_ROOT: C:\cygwin
CYG_SETUP: setup-x86.exe
JULIA_TEST_MAXRSS_MB: 500

- MINGW_ARCH: "x86_64"
CYG_ROOT: C:\cygwin64
CYG_SETUP: setup-x86_64.exe
JULIA_TEST_MAXRSS_MB: 450

# Only build on master and PR's for now, not personal branches
# Whether or not PR's get built is determined in the webhook settings
branches:
only:
- master
- /^release-.*/

# Note: use `[ci skip]` or `[skip ci]` anywhere in the commit message and AppVeyor won't be
# built for that commit. You can use `[skip appveyor]` to explicitly skip AppVeyor and
# allow other CI to still run.
skip_commits:
# Add [av skip] to commit messages for docfixes, etc to reduce load on queue
message: /\[av skip\]/
# Skip running CI for changes only to the documentation
# https://github.com/JuliaLang/julia/pull/27356#discussion_r192536676
# files:
# - doc/

notifications:
- provider: Email
on_build_success: false
on_build_failure: false
on_build_status_changed: false

cache:
- '%CYG_CACHE%'
- '%CCACHE_DIR%'

init:
- git config --global core.autocrlf input

install:
- '%CYG_ROOT%\%CYG_SETUP% -gnq -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_CACHE%" -P make,python2,libiconv,curl,time,p7zip,ccache,mingw64-%MINGW_ARCH%-gcc-g++,mingw64-%MINGW_ARCH%-gcc-fortran > NULL 2>&1'
- '%CYG_ROOT%\bin\cygcheck -dc cygwin'

build_script:
- 'echo Building Julia'
- '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER && ./contrib/windows/appveyor_build.sh"'

test_script:
- 'echo Testing Julia'
- usr\bin\julia -e "Base.require(Main, :InteractiveUtils).versioninfo()"
- usr\bin\julia --sysimage-native-code=no -e "true"
- cd julia-* && .\bin\julia.exe --check-bounds=yes share\julia\test\runtests.jl all &&
.\bin\julia.exe --check-bounds=yes share\julia\test\runtests.jl LibGit2/online download
- cd ..
- usr\bin\julia usr\share\julia\test\embedding\embedding-test.jl test\embedding\embedding.exe
86 changes: 0 additions & 86 deletions .circleci/config.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM julia:latest

RUN apt-get update && apt-get install -y build-essential libatomic1 python gfortran perl wget m4 cmake pkg-config git
8 changes: 8 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extensions": [
"julialang.language-julia",
"ms-vscode.cpptools"
],

"dockerFile": "Dockerfile"
}
65 changes: 0 additions & 65 deletions .freebsdci.sh

This file was deleted.

4 changes: 2 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# treat patches as files that should not be modified
*.patch -text
# treat all files as files that should not be modified
* -text
23 changes: 0 additions & 23 deletions .github/CODE_OF_CONDUCT.md

This file was deleted.

10 changes: 0 additions & 10 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

12 changes: 0 additions & 12 deletions .github/SUPPORT.md

This file was deleted.

3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/dist
/dist-extras
/julia
/julia.bat
/usr
/oprofile_data
/usr-staging
Expand All @@ -16,6 +17,7 @@
*.dwo
*.do
*.o
*.o.tmp
*.obj
*.so
*.dylib
Expand All @@ -28,3 +30,4 @@

/perf*
.DS_Store
.idea/*
5 changes: 3 additions & 2 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,9 @@ M. Prentis <[email protected]> <[email protected]>
Peter <[email protected]> <[email protected]>
Peter <[email protected]> <https://github.com/peter1000>

Rafael Fourquet <[email protected]> <[email protected]>
Rafael Fourquet <[email protected]> <[email protected]>
Rafael Fourquet <[email protected]> <[email protected]>
Rafael Fourquet <[email protected]> <[email protected]> <[email protected]>
Rafael Fourquet <[email protected]> <[email protected]>

Dan Wlasiuk <[email protected]> <[email protected]>
Dan Wlasiuk <[email protected]> <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ before_install:
ln -s /usr/bin/g++-5 $HOME/bin/x86_64-linux-gnu-g++;
gcc --version;
BAR="bar -i 30";
BUILDOPTS="-j5 VERBOSE=1 FORCE_ASSERTIONS=1 LLVM_ASSERTIONS=1 USECCACHE=1";
BUILDOPTS="-j5 VERBOSE=1 FORCE_ASSERTIONS=1 LLVM_ASSERTIONS=1 USECCACHE=1 USE_BINARYBUILDER_LIBUV=0 USE_BINARYBUILDER_LIBUNWIND=0 USE_BINARYBUILDER_LLVM=0";
echo "override ARCH=$ARCH" >> Make.user;
sudo sh -c "echo 0 > /proc/sys/net/ipv6/conf/lo/disable_ipv6";
export JULIA_CPU_THREADS=4;
Expand Down Expand Up @@ -129,7 +129,7 @@ script:
# skip tests if only files within the "doc" dir have changed
- if [ $(echo "$FILES_CHANGED" | grep -cv '^doc/') -gt 0 ]; then
/tmp/julia/bin/julia --check-bounds=yes runtests.jl $TESTSTORUN &&
/tmp/julia/bin/julia --check-bounds=yes runtests.jl LibGit2/online Pkg/pkg download; fi
/tmp/julia/bin/julia --check-bounds=yes runtests.jl LibGit2/online download; fi
- popd
# test that the embedding code works on our installation
- mkdir /tmp/embedding-test &&
Expand Down
Loading

0 comments on commit edb7d49

Please sign in to comment.