Skip to content

Commit 3473b2d

Browse files
ocotsocots
committed
fix merge with main
2 parents 8a6a822 + 8942c9e commit 3473b2d

File tree

12 files changed

+371
-461
lines changed

12 files changed

+371
-461
lines changed

‎.github/workflows/AutoAssign.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# https://github.com/marketplace/actions/auto-assign-issue
2+
name: Auto Assign
3+
on:
4+
issues:
5+
types: [opened, reopened]
6+
pull_request:
7+
types: [opened, reopened]
8+
jobs:
9+
call:
10+
uses: control-toolbox/CTActions/.github/workflows/auto-assign.yml@main
11+
with:
12+
assignees: ocots
13+
numOfAssignee: 1

‎.github/workflows/CI.yml‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ on:
77
tags: '*'
88
pull_request:
99
jobs:
10-
test:
11-
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
12-
runs-on: ${{ matrix.os }}
10+
call:
1311
strategy:
1412
matrix:
1513
version:
@@ -19,10 +17,8 @@ jobs:
1917
- ubuntu-latest
2018
arch:
2119
- x64
22-
steps:
23-
- uses: actions/checkout@v4
24-
- uses: julia-actions/setup-julia@latest
25-
with:
26-
version: ${{ matrix.version }}
27-
arch: ${{ matrix.arch }}
28-
- uses: julia-actions/julia-runtest@latest
20+
uses: control-toolbox/CTActions/.github/workflows/ci.yml@main
21+
with:
22+
version: ${{ matrix.version }}
23+
os: ${{ matrix.os }}
24+
arch: ${{ matrix.arch }}

‎.github/workflows/CompatHelper.yml‎

Lines changed: 2 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,6 @@ on:
44
schedule:
55
- cron: 0 0 * * *
66
workflow_dispatch:
7-
permissions:
8-
contents: write
9-
pull-requests: write
107
jobs:
11-
CompatHelper:
12-
runs-on: ubuntu-latest
13-
steps:
14-
- name: Check if Julia is already available in the PATH
15-
id: julia_in_path
16-
run: which julia
17-
continue-on-error: true
18-
- name: Install Julia, but only if it is not already available in the PATH
19-
uses: julia-actions/setup-julia@v1
20-
with:
21-
version: '1'
22-
arch: ${{ runner.arch }}
23-
if: steps.julia_in_path.outcome != 'success'
24-
- name: "Add the General registry via Git"
25-
run: |
26-
import Pkg
27-
ENV["JULIA_PKG_SERVER"] = ""
28-
Pkg.Registry.add("General")
29-
shell: julia --color=yes {0}
30-
- name: "Install CompatHelper"
31-
run: |
32-
import Pkg
33-
name = "CompatHelper"
34-
uuid = "aa819f21-2bde-4658-8897-bab36330d9b7"
35-
version = "3"
36-
Pkg.add(; name, uuid, version)
37-
shell: julia --color=yes {0}
38-
- name: "Run CompatHelper"
39-
run: |
40-
import CompatHelper
41-
CompatHelper.main(; subdirs=["", "docs", "test"], entry_type=CompatHelper.DropEntry())
42-
shell: julia --color=yes {0}
43-
env:
44-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
45-
COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
46-
# COMPATHELPER_PRIV: ${{ secrets.COMPATHELPER_PRIV }}
8+
call:
9+
uses: control-toolbox/CTActions/.github/workflows/compat-helper.yml@main

‎.github/workflows/Coverage.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- main
77
tags: '*'
88
jobs:
9-
test:
9+
call:
1010
uses: control-toolbox/CTActions/.github/workflows/coverage.yml@main
1111
secrets:
1212
codecov-secret: ${{ secrets.CODECOV_TOKEN }}

‎.github/workflows/Documentation.yml‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# [.github/workflows/Documentation.yml]
21
name: Documentation
32

43
on:
@@ -9,17 +8,5 @@ on:
98
pull_request:
109

1110
jobs:
12-
build:
13-
runs-on: ubuntu-latest
14-
steps:
15-
- uses: actions/checkout@v4
16-
- uses: julia-actions/setup-julia@latest
17-
- uses: julia-actions/julia-buildpkg@latest
18-
- name: Install dependencies
19-
run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
20-
- name: Build and deploy
21-
env:
22-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # If authenticating with GitHub Actions token
23-
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # If authenticating with SSH deploy key
24-
GKSwstype: 100 # To make GitHub Action work, disable showing a plot window with the GR backend of the Plots package
25-
run: julia --project=docs/ -e 'ENV["GKSwstype"]="nul" ; include("docs/make.jl")'
11+
call:
12+
uses: control-toolbox/CTActions/.github/workflows/documentation.yml@main

‎.github/workflows/Formatter.yml‎

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,10 @@
11
name: Formatter
22

3-
# Modified from https://github.com/julia-actions/julia-format
43
on:
54
schedule:
65
- cron: '0 0 * * *'
76
workflow_dispatch:
87

98
jobs:
10-
build:
11-
runs-on: ubuntu-latest
12-
steps:
13-
- uses: actions/checkout@v4
14-
- uses: julia-actions/setup-julia@latest
15-
- uses: julia-actions/cache@v2
16-
- uses: julia-actions/julia-buildpkg@latest
17-
- name: Install JuliaFormatter and format
18-
run: |
19-
julia -e 'import Pkg; Pkg.add("JuliaFormatter")'
20-
julia -e 'using JuliaFormatter; format(".", BlueStyle())'
21-
# https://github.com/marketplace/actions/create-pull-request
22-
# https://github.com/peter-evans/create-pull-request#reference-example
23-
- name: Create Pull Request
24-
id: cpr
25-
uses: peter-evans/create-pull-request@v7
26-
with:
27-
token: ${{ secrets.GITHUB_TOKEN }}
28-
commit-message: ":robot: Format .jl files"
29-
title: '[AUTO] JuliaFormatter.jl run'
30-
branch: auto-juliaformatter-pr
31-
delete-branch: true
32-
labels: formatting, automated pr, no changelog
33-
- name: Check outputs
34-
run: |
35-
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
36-
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
9+
call:
10+
uses: control-toolbox/CTActions/.github/workflows/formatter.yml@main

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
[blue-url]: https://github.com/JuliaDiff/BlueStyle
2323

2424
This repo is part of the [control-toolbox ecosystem](https://github.com/control-toolbox).
25-
The control-toolbox ecosystem gathers Julia packages for mathematical control and applications. The root package is [OptimalControl.jl](https://github.com/control-toolbox/OptimalControl.jl) which aims to provide tools to model and solve optimal control problems with ordinary differential equations by direct and indirect methods.
25+
The control-toolbox ecosystem gathers Julia packages for mathematical control and applications. The root package is [OptimalControl.jl](https://github.com/control-toolbox/OptimalControl.jl) which aims to provide tools to model and solve optimal control problems with ordinary differential equations by direct and indirect methods, both on CPU and GPU.
2626

2727
[![doc OptimalControl.jl](https://img.shields.io/badge/Documentation-OptimalControl.jl-blue)](http://control-toolbox.org/OptimalControl.jl)
2828

@@ -47,4 +47,4 @@ You can find first good issues (if any 🙂) [here][first-good-issue-url]. You m
4747
If you want to ask a question, feel free to start a discussion [here](https://github.com/orgs/control-toolbox/discussions). This forum is for general discussion about this repository and the [control-toolbox organization](https://github.com/control-toolbox).
4848

4949
>[!NOTE]
50-
> If you want to add an application or a package to the control-toolbox ecosystem, please follow this [set up tutorial](https://github.com/control-toolbox/Tutorials.jl/discussions/9).
50+
> If you want to add an application or a package to the control-toolbox ecosystem, please follow this [set up tutorial](https://github.com/orgs/control-toolbox/discussions/65).

‎docs/make.jl‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
using Documenter
22
using OptimalControl
33

4-
mkpath("./docs/src/assets")
5-
cp("./docs/Manifest.toml", "./docs/src/assets/Manifest.toml"; force=true)
6-
cp("./docs/Project.toml", "./docs/src/assets/Project.toml"; force=true)
4+
# For reproducibility
5+
mkpath(joinpath(@__DIR__, "src", "assets"))
6+
cp(
7+
joinpath(@__DIR__, "Manifest.toml"),
8+
joinpath(@__DIR__, "src", "assets", "Manifest.toml");
9+
force=true,
10+
)
11+
cp(
12+
joinpath(@__DIR__, "Project.toml"),
13+
joinpath(@__DIR__, "src", "assets", "Project.toml");
14+
force=true,
15+
)
716

817
repo_url = "github.com/control-toolbox/Tutorials.jl"
918

0 commit comments

Comments
 (0)