Skip to content

Commit

Permalink
Merge pull request #23 from JuliaPOMDP/jll_integration
Browse files Browse the repository at this point in the history
POMDPSolve_jll Integration and POMDPTools Update
  • Loading branch information
zsunberg authored Dec 28, 2023
2 parents de85a9f + 20caae5 commit ccc9d77
Show file tree
Hide file tree
Showing 24 changed files with 1,162 additions and 953 deletions.
62 changes: 15 additions & 47 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
@@ -1,68 +1,36 @@
name: CI

# Run on master, tags, or any pull request
on:
push:
branches: [master]
tags: ["*"]
branches:
- master
tags: '*'
pull_request:

jobs:
# unit tests with coverage
test:
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
version:
- "1.6" # Latest
- "1"
- "1.6"
os:
- ubuntu-latest
- macOS-latest
- windows-latest
arch:
- x64
steps:
# check out the project and install Julia
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v1
with:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}

# using a cache can speed up execution times
- uses: actions/cache@v2
env:
cache-name: cache-artifacts
- uses: julia-actions/cache@v1
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v3
with:
path: ~/.julia/artifacts
key: ${{ runner.os }}-${{ matrix.arch }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
restore-keys: |
${{ runner.os }}-${{ matrix.arch }}-test-${{ env.cache-name }}-
${{ runner.os }}-${{ matrix.arch }}-test-
${{ runner.os }}-${{ matrix.arch }}-
${{ runner.os }}-
- uses: julia-actions/julia-buildpkg@latest
- run: |
git config --global user.name Tester
git config --global user.email [email protected]
- name: Run Tests
uses: julia-actions/julia-runtest@latest
docs:
name: Documentation
runs-on: ubuntu-latest
steps:

- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@v1
with:
version: '1'
- run: |
julia --project=docs -e '
using Pkg
Pkg.develop(PackageSpec(path=pwd()))
Pkg.instantiate()'
- run: julia --project=docs docs/make.jl
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
DOCUMENTER_DEBUG: true
files: lcov.info
22 changes: 20 additions & 2 deletions .github/workflows/CompatHelper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,29 @@ on:
schedule:
- cron: 0 0 * * *
workflow_dispatch:
permissions:
contents: write
pull-requests: write
jobs:
CompatHelper:
runs-on: ubuntu-latest
steps:
- name: Check if Julia is already available in the PATH
id: julia_in_path
run: which julia
continue-on-error: true
- name: Install Julia, but only if it is not already available in the PATH
uses: julia-actions/setup-julia@v1
with:
version: '1'
arch: ${{ runner.arch }}
if: steps.julia_in_path.outcome != 'success'
- name: "Add the General registry via Git"
run: |
import Pkg
ENV["JULIA_PKG_SERVER"] = ""
Pkg.Registry.add("General")
shell: julia --color=yes {0}
- name: "Install CompatHelper"
run: |
import Pkg
Expand All @@ -22,5 +41,4 @@ jobs:
shell: julia --color=yes {0}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
# COMPATHELPER_PRIV: ${{ secrets.COMPATHELPER_PRIV }}
COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
22 changes: 22 additions & 0 deletions .github/workflows/Documentation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Documentation
on:
push:
branches:
- main
tags: [v*]
pull_request:

jobs:
build:
permissions:
contents: write
statuses: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v1
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-docdeploy@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
11 changes: 8 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
*.jl.cov
*.jl.*.cov
*.jl.mem
*.alpha
*.pg
**/.DS_Store
.vscode
Manifest.toml
docs/build/
test/*.pomdpx
test/*.out
17 changes: 0 additions & 17 deletions .travis.yml

This file was deleted.

25 changes: 11 additions & 14 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,31 +1,28 @@
name = "POMDPSolve"
uuid = "a575d7f4-a5df-53f5-8ba4-9d691c1ba8ff"
repo = "https://github.com/JuliaPOMDP/POMDPSolve.jl"
version = "0.2.3"
version = "0.3.0"

[deps]
BeliefUpdaters = "8bb6e9a1-7d73-552c-a44a-e5dc5634aac4"
POMDPFiles = "9cf5b727-2e06-5671-8c87-8c6b0f729d5d"
POMDPModelTools = "08074719-1b2a-587c-a292-00f91cc44415"
POMDPPolicies = "182e52fb-cfd0-5e46-8c26-fd0667c990f4"
POMDPSolve_jll = "7dc2201c-deb4-56f8-b3a0-2ab29a2c732a"
POMDPTools = "7588e00f-9cae-40de-98dc-e0c70c48cdd7"
POMDPs = "a93abf59-7444-517b-a68a-c42f96afdd7d"
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb"

[compat]
BeliefUpdaters = "0.1, 0.2"
POMDPFiles = "0.2.3"
POMDPModelTools = "0.2, 0.3"
POMDPPolicies = "0.2, 0.3, 0.4"
POMDPFiles = "0.2"
POMDPSolve_jll = "5.4.1"
POMDPTools = "0.1"
POMDPs = "0.9"
Reexport = "0.2"
julia = "1"
Suppressor = "0.2"
julia = "1.6"

[extras]
SARSOP = "cef570c6-3a94-5604-96b7-1a5e143043f2"
POMDPModels = "355abbd5-f08e-5560-ac9e-8b5f2592a0ca"
POMDPSimulators = "e0d0a172-29c6-5d4e-96d0-f262df5d01fd"
POMDPTesting = "92e6a534-49c2-5324-9027-86e3c861ab81"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["POMDPModels", "POMDPTesting", "POMDPSimulators", "Test"]
test = ["POMDPModels", "SARSOP", "Test"]
Loading

2 comments on commit ccc9d77

@dylan-asmar
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/97953

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.3.0 -m "<description of version>" ccc9d776a338de08b846e317cc6656696ac400af
git push origin v0.3.0

Please sign in to comment.