Skip to content

Commit 68dd4fa

Browse files
committed
Merge branch 'jyoon/documenter_teset' into jyoon/refactor_1
2 parents 75c5dd4 + 559c825 commit 68dd4fa

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

.github/workflows/CI.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@ on:
1616
- Project.toml
1717
jobs:
1818
test:
19-
name: Julia ${{ matrix.julia-version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
19+
name: Julia ${{ matrix.julia-version }} - ${{ matrix.os }} - ${{ matrix.julia-arch }} - ${{ github.event_name }}
2020
runs-on: ${{ matrix.os }}
2121
strategy:
2222
fail-fast: false
2323
matrix:
2424
os: [windows-latest, macos-latest]
25-
julia-version: ['1.10', 'lts']
26-
arch:
27-
- x64
25+
julia-arch: [x64]
26+
julia-version: ['1.10','1.11','1.12', 'lts']
27+
2828
steps:
2929
- uses: actions/checkout@v4
3030
- uses: julia-actions/setup-julia@v2
3131
with:
3232
version: ${{ matrix.julia-version }}
33-
arch: ${{ matrix.arch }}
33+
arch: ${{ matrix.julia-arch }}
3434
- uses: actions/cache@v4
3535
env:
3636
cache-name: cache-artifacts
@@ -45,7 +45,7 @@ jobs:
4545
${{ runner.os }}-
4646
- uses: julia-actions/julia-buildpkg@v1
4747
- name: Resolve/Update dependencies
48-
run: julia -e 'using Pkg; Pkg.resolve()' # Or Pkg.update()
48+
run: julia -e 'using Pkg; Pkg.activate("."); Pkg.instantiate(); Pkg.update();' # Or Pkg.update()
4949
- uses: julia-actions/julia-runtest@v1
5050
with:
5151
annotate: true

Project.toml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ uuid = "c853eca7-4467-4dac-871a-88cef1644acc"
33
version = "1.0.0"
44
authors = []
55

6+
[workspace]
7+
projects = ["test", "docs"]
8+
69
[deps]
710
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
811
FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
@@ -17,24 +20,23 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
1720
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1821

1922
[weakdeps]
20-
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
21-
FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
2223
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
2324

24-
[extras]
25-
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" # UUID for the standard library Test
26-
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
27-
2825
[compat]
2926
AbstractFFTs = "1"
3027
FFTW = "1"
3128
FileIO = "1"
3229
ImageIO = "0.6"
3330
ImageMagick = "1"
3431
Images = "0.26"
35-
MAT = "0.10, 0.11"
32+
MAT = "0.10"
3633
Plots = "1"
3734
Statistics = "1"
3835

36+
[extras]
37+
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
38+
FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
39+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
40+
3941
[targets]
4042
test = ["Test", "FFTW", "AbstractFFTs"]

docs/Project.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[deps]
2+
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"

0 commit comments

Comments
 (0)