Skip to content

Commit

Permalink
Merge pull request #70 from JuliaRobotics/rd/update-deps
Browse files Browse the repository at this point in the history
Update dependencies and require Julia >= 1.6
  • Loading branch information
rdeits authored May 21, 2023
2 parents 6a24694 + 43ce0e7 commit 3df38b3
Show file tree
Hide file tree
Showing 6 changed files with 62 additions and 86 deletions.
50 changes: 35 additions & 15 deletions .github/workflows/CompatHelper.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,44 @@
name: CompatHelper

on:
schedule:
- cron: '00 00 * * *'

- cron: 0 0 * * *
workflow_dispatch:
permissions:
contents: write
pull-requests: write
jobs:
CompatHelper:
runs-on: ${{ matrix.os }}
strategy:
matrix:
julia-version: [1.2.0]
julia-arch: [x86]
os: [ubuntu-latest]
runs-on: ubuntu-latest
steps:
- uses: julia-actions/setup-julia@latest
- 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: ${{ matrix.julia-version }}
- name: Pkg.add("CompatHelper")
run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
- name: CompatHelper.main()
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
name = "CompatHelper"
uuid = "aa819f21-2bde-4658-8897-bab36330d9b7"
version = "3"
Pkg.add(; name, uuid, version)
shell: julia --color=yes {0}
- name: "Run CompatHelper"
run: |
import CompatHelper
CompatHelper.main()
shell: julia --color=yes {0}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: julia -e 'using CompatHelper; CompatHelper.main()'
COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
17 changes: 16 additions & 1 deletion .github/workflows/TagBot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,22 @@ on:
types:
- created
workflow_dispatch:
inputs:
lookback:
default: 3
permissions:
actions: read
checks: read
contents: write
deployments: read
issues: read
discussions: read
packages: read
pages: read
pull-requests: read
repository-projects: read
security-events: read
statuses: read
jobs:
TagBot:
if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
Expand All @@ -12,4 +28,3 @@ jobs:
- uses: JuliaRegistries/TagBot@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
ssh: ${{ secrets.DOCUMENTER_KEY }}
18 changes: 5 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
version:
- '1.3'
- '1.6'
- '1'
os:
- ubuntu-latest
Expand All @@ -21,24 +21,16 @@ jobs:
arch:
- x64
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: julia-actions/setup-julia@v1
with:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
- uses: actions/cache@v1
env:
cache-name: cache-artifacts
CI: true
with:
path: ~/.julia/artifacts
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
restore-keys: |
${{ runner.os }}-test-${{ env.cache-name }}-
${{ runner.os }}-test-
${{ runner.os }}-
- uses: julia-actions/cache@v1
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
with:
prefix: ${{ matrix.prefix }}
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v1
with:
Expand Down
8 changes: 4 additions & 4 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "MeshCatMechanisms"
uuid = "6ad125db-dd91-5488-b820-c1df6aab299d"
version = "0.8.2"
version = "0.9.0"

[deps]
ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
Expand All @@ -17,17 +17,17 @@ RigidBodyDynamics = "366cf18f-59d5-5db9-a4de-86a9f6786172"
[compat]
ColorTypes = "0.7, 0.8, 0.9, 0.10, 0.11"
CoordinateTransformations = "0.5, 0.6"
GeometryBasics = "0.2, 0.3, 0.4"
GeometryBasics = "0.4"
InteractBase = "0.8, 0.9, 0.10"
Interpolations = "0.9, 0.10, 0.11, 0.12, 0.13, 0.14"
LoopThrottle = "0.1"
MechanismGeometries = "0.7"
MeshCat = "0.13, 0.14, 0.15"
MeshCat = "0.13, 0.14, 0.15, 0.16"
NBInclude = "1, 2"
OrderedCollections = "1"
RigidBodyDynamics = "2"
ValkyrieRobot = "0.2.1"
julia = "1.3"
julia = "1.6"

[extras]
NBInclude = "0db19996-df87-5ea3-a455-e3a50d440464"
Expand Down
41 changes: 0 additions & 41 deletions examples/manipulation_with_blink.jl

This file was deleted.

14 changes: 2 additions & 12 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,8 @@ vis = Visualizer()
for file in readdir(dir)
base, ext = splitext(file)
if ext == ".jl"
if file == "manipulation_with_electron.jl"
# The interaction between MeshCat and Interact
# causes weird task deadlocks that I don't want
# to deal with right now.
@warn "Skipping $file"
else
@info "Running $file"
include(joinpath(dir, file))
end
elseif ext == ".ipynb"
@info "Running notebook $file"
@nbinclude(joinpath(dir, file))
@info "Running $file"
include(joinpath(dir, file))
end
end
end
Expand Down

2 comments on commit 3df38b3

@rdeits
Copy link
Collaborator Author

@rdeits rdeits commented on 3df38b3 May 21, 2023

Choose a reason for hiding this comment

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

@JuliaRegistrator register()

@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/83968

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.9.0 -m "<description of version>" 3df38b356371993aff168a47301bc53ae6a524c7
git push origin v0.9.0

Please sign in to comment.