Skip to content
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.

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

split libpolymake_julia and use artifacts #308

Merged
merged 23 commits into from
Aug 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d0019f3
split libpolymake_julia into separate repo
benlorenz Jul 1, 2020
ea45d84
runtests: try to run on ubuntu 20.04 as well
benlorenz Jul 2, 2020
693063a
fix macos tarball name
benlorenz Jul 2, 2020
0ee2570
try to fix cxxwrap 0.10 by removing case distinction
benlorenz Jul 2, 2020
91d5cc6
Merge pull request #305 from oscar-system/ubuntu20
benlorenz Jul 2, 2020
dc24a93
cxxwrap 0.10: adjust comment, add fixme
benlorenz Jul 6, 2020
073ff09
use polymake_run_script instead of directly running polymake
benlorenz Jul 6, 2020
7f3817c
drop old cxxwrap and bump (load)flint
benlorenz Jul 9, 2020
90bb8c4
remove unneeded require from json script
benlorenz Jul 10, 2020
a86a077
include compilersupportlibraries for testing
benlorenz Jul 10, 2020
2755906
update libpolymake_julia hash
benlorenz Jul 10, 2020
6f17c67
more deps ...
benlorenz Jul 10, 2020
6232981
switch to artifacts with libpolymake_julia
benlorenz Jul 14, 2020
99289b0
gh-actions: add extra jll deps, remove build step
benlorenz Jul 15, 2020
176c59a
check build-time libcxxwrap version for setup_types
benlorenz Aug 4, 2020
aa79e45
cleanup and remove deps dir
benlorenz Aug 4, 2020
1a0baba
jlpolymake version check added
benlorenz Aug 4, 2020
4d3ee1a
Merge remote-tracking branch 'origin/master' into testing/libpolymake…
benlorenz Aug 5, 2020
da913e2
remove manifest, improve compat, bump to 0.5
benlorenz Aug 9, 2020
bcff90d
warn if unsupported polymake config var is set
benlorenz Aug 9, 2020
b32d168
remove loadflint (init is in flint_jll now)
benlorenz Aug 11, 2020
af47adf
Merge branch 'master' into testing/libpolymake_julia_artifacts
benlorenz Aug 11, 2020
6bea8db
remove duplicate json folder variable
benlorenz Aug 11, 2020
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
12 changes: 6 additions & 6 deletions .github/workflows/runtests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- master
- testing/**
pull_request:
branches:
- master
Expand Down Expand Up @@ -38,7 +39,6 @@ jobs:
uses: julia-actions/setup-julia@v1
with:
version: ${{ matrix.julia-version }}
- uses: julia-actions/julia-buildpkg@latest
- name: "Fill polyDB container"
run: mongorestore --host localhost -u admin -p admin --port 27017 .github/polydb_dump
- uses: julia-actions/julia-runtest@latest
Expand Down Expand Up @@ -70,12 +70,13 @@ jobs:
- xcode: '11.4'
os: macos-latest
julia-version: 1.4
- cxxwrap: '0.9'
os: ubuntu-latest
julia-version: 1.4
- cxxwrap: '0.10'
os: ubuntu-latest
julia-version: 1.4
- os: ubuntu-20.04
julia-version: 1.4
- os: ubuntu-16.04
julia-version: 1.4

fail-fast: false

Expand All @@ -85,13 +86,12 @@ jobs:
uses: julia-actions/setup-julia@v1
with:
version: ${{ matrix.julia-version }}
- name: "Pin CxxWrap"
- name: "pin CxxWrap"
if: matrix.cxxwrap != ''
run: julia --project -e 'using Pkg; pkg"add CxxWrap@${{ matrix.cxxwrap }}"; pkg"pin CxxWrap";'
- name: "set xcode"
if: matrix.xcode != ''
run: echo "::set-env name=DEVELOPER_DIR::/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer"
- uses: julia-actions/julia-buildpkg@latest
- uses: julia-actions/julia-runtest@latest
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v1
Expand Down
15 changes: 1 addition & 14 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,22 +1,9 @@
*.jl.cov
*.jl.*.cov
*.jl.mem
deps/src/CMakeCache.txt
deps/src/CMakeFiles/*
deps/src/Makefile
deps/src/cmake_install.cmake
deps/src/libpolymake.*
deps/src/generated/*
deps/xcodetypeinfo/*
!deps/xcodetypeinfo/hello.cpp
!deps/xcodetypeinfo/CMakeLists.txt
deps/build.log
deps/deps.jl
deps/jlcxx_version.jl
deps/usr
deps/json
local
Manifest.toml
src/generated/json/*.json
src/generated/*.jl
.vscode
docs/build/*
15 changes: 11 additions & 4 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,29 +1,36 @@
name = "Polymake"
uuid = "d720cf60-89b5-51f5-aff5-213f193123e7"
repo = "https://github.com/oscar-system/Polymake.jl.git"
version = "0.4.2"
version = "0.5.0"

[deps]
BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
CMake = "631607c0-34d2-5d66-819e-eb0f9aa2061a"
CxxWrap = "1f15a43c-97ca-5a2a-ae31-89f07a497df4"
FLINT_jll = "e134572f-a0d5-539d-bddf-3cad8db41a82"
JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
LoadFlint = "472f376f-f1cf-461b-9ac1-d103423be9b7"
Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
Mongoc = "4fe8b98c-fc19-5c23-8ec2-168ff83495f2"
MozillaCACerts_jll = "14a3606d-f60d-562e-9121-12d972cd8159"
Ninja_jll = "76642167-d241-5cee-8c94-7a494e8cb7b7"
Perl_jll = "83958c19-0796-5285-893e-a1267f8ec499"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
libpolymake_julia_jll = "4d8266f6-2b3b-57e3-ad7a-d431eaaac945"
polymake_jll = "7c209550-9012-526c-9264-55ba7a78ba2c"

[compat]
BinaryProvider = "^0.5.3"
CMake = "^1.1.1"
CxxWrap = "0.9.1, 0.10.1, 0.11"
CxxWrap = "0.10.1, 0.11"
FLINT_jll = "~2.6.2"
JSON = "^0.20, ^0.21"
LoadFlint = "^0.2.1"
Perl_jll = "=5.30.3"
julia = "^1.3"
libpolymake_julia_jll = "~0.1.0"
polymake_jll = "~4.1.0"

[extras]
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
Expand Down
230 changes: 0 additions & 230 deletions deps/build.jl

This file was deleted.

48 changes: 0 additions & 48 deletions deps/build_FLINT.v0.0.2.jl

This file was deleted.

Loading