Skip to content

Commit

Permalink
Merge branch 'main' into pr/10
Browse files Browse the repository at this point in the history
  • Loading branch information
fonsp committed Aug 20, 2024
2 parents b3010fc + b998a9c commit 153ee58
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/IntegrationTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ jobs:
- { user: JuliaPluto, repo: PlutoSliderServer.jl }

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v1
with:
version: ${{ matrix.julia-version }}
arch: x64
- uses: julia-actions/julia-buildpkg@v1
- name: Clone Downstream
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ matrix.package.user }}/${{ matrix.package.repo }}
path: downstream
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ jobs:
# Without setting this, a failing test cancels all others
fail-fast: false
matrix:
julia-version: ['1.6', '1.10', 'nightly'] # "~1.11.0-0",
julia-version: ["1.6", "1", "~1.11.0-0", "nightly"]
os: [ubuntu-latest]

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# Makes thes `julia` command available
- uses: julia-actions/setup-julia@v1
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@

Manifest.toml
.DS_Store
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,11 @@ Take a look at the [**Documentation →**](https://plutojl.org/en/docs/plutodepe

To work on this package, clone both the Pluto.jl and PlutoDependencyExplorer.jl repositories to your local drive. Then:

1. In your global environment, develop the Pluto and PlutoDependencyExplorer packages:
1. In your global environment (or another one), develop the Pluto and PlutoDependencyExplorer packages:
`(@1.10) pkg> dev ~/Documents/Pluto.jl`
`(@1.10) pkg> dev ~/Documents/PlutoDependencyExplorer.jl`
2. You can now run or `Pkg.test()` Pluto, and it will use your local copy of PlutoDependencyExplorer.
2. You can `(@1.10) pkg> test PlutoDependencyExplorer` to run the tests
3. You can also run Pluto, or `(@1.10) pkg> test Pluto`, and it will use your local copy of PlutoDependencyExplorer. This lets you test how your changes to PlutoDependencyExplorer integrate into Pluto.

### Advanced: making a change to Pluto and PlutoDependencyExplorer at the same time.

Expand Down

0 comments on commit 153ee58

Please sign in to comment.