Skip to content

Commit 0cf05d1

Browse files
Merge branch 'JuliaGPU:master' into QR_views
2 parents a150f48 + 228fb9e commit 0cf05d1

29 files changed

+405
-472
lines changed

.buildkite/pipeline.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ steps:
22
- label: "CUDA.jl"
33
plugins:
44
- JuliaCI/julia#v1:
5-
version: 1.8
5+
version: "1.10"
66
- JuliaCI/julia-coverage#v1:
77
codecov: true
88
command: |
@@ -23,7 +23,7 @@ steps:
2323
- label: "oneAPI.jl"
2424
plugins:
2525
- JuliaCI/julia#v1:
26-
version: 1.8
26+
version: "1.10"
2727
- JuliaCI/julia-coverage#v1:
2828
codecov: true
2929
command: |
@@ -48,7 +48,7 @@ steps:
4848
- label: "Metal.jl"
4949
plugins:
5050
- JuliaCI/julia#v1:
51-
version: 1.8
51+
version: "1.10"
5252
- JuliaCI/julia-coverage#v1:
5353
codecov: true
5454
command: |

.github/workflows/CompatHelper.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ jobs:
99
CompatHelper:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4
1313
- name: Get Julia compatibility
1414
id: julia_compat
1515
# NOTE: this requires a Julia compat lower-bound with minor version!
1616
run : |
1717
version=$(grep '^julia = ' Project.toml | grep -o '".*"' | cut -d '"' -f2)
1818
echo "::set-output name=version::$version"
19-
- uses: julia-actions/setup-julia@v1
19+
- uses: julia-actions/setup-julia@v2
2020
with:
2121
version: ${{ steps.julia_compat.outputs.version }}
2222
- name: Install CompatHelper

.github/workflows/ManifestUpdater.yml

Lines changed: 0 additions & 70 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
version: ['1.8', '1.9', '1.10.0-beta2', 'nightly']
17+
version: ['1.8', '1.9', '1.10', 'nightly']
1818
os: [ubuntu-latest, macOS-latest, windows-latest]
1919
arch: [x64]
2020
steps:
21-
- uses: actions/checkout@v3
22-
- uses: julia-actions/setup-julia@latest
21+
- uses: actions/checkout@v4
22+
- uses: julia-actions/setup-julia@v2
2323
with:
2424
version: ${{ matrix.version }}
2525
arch: ${{ matrix.arch }}
26-
- uses: actions/cache@v3
26+
- uses: actions/cache@v4
2727
env:
2828
cache-name: cache-artifacts
2929
with:
@@ -33,26 +33,38 @@ jobs:
3333
${{ runner.os }}-test-${{ env.cache-name }}-
3434
${{ runner.os }}-test-
3535
${{ runner.os }}-
36-
- uses: julia-actions/julia-buildpkg@latest
37-
- run: |
38-
git config --global user.name Tester
39-
git config --global user.email te@st.er
40-
- uses: julia-actions/julia-runtest@latest
36+
- name: Develop subpackages
37+
run: |
38+
julia --project -e "
39+
using Pkg
40+
Pkg.develop([PackageSpec(; name=basename(path), path) for path in ARGS])
41+
" lib/GPUArraysCore lib/JLArrays
42+
- uses: julia-actions/julia-runtest@v1
4143
continue-on-error: ${{ matrix.version == 'nightly' }}
4244
- uses: julia-actions/julia-processcoverage@v1
43-
- uses: codecov/codecov-action@v3
4445
with:
46+
directories: src,lib
47+
- uses: codecov/codecov-action@v4
48+
with:
49+
token: ${{ secrets.CODECOV_TOKEN }}
50+
fail_ci_if_error: false
4551
file: lcov.info
4652
docs:
4753
name: Documentation
4854
runs-on: ubuntu-latest
4955
steps:
50-
- uses: actions/checkout@v3
51-
- uses: julia-actions/setup-julia@latest
56+
- uses: actions/checkout@v4
57+
- uses: julia-actions/setup-julia@v2
5258
with:
5359
version: '1.8'
60+
- name: Develop packages
61+
run: |
62+
julia -e "
63+
using Pkg
64+
Pkg.develop([PackageSpec(; name=basename(splitext(path)[1]), path) for path in ARGS])
65+
" ../GPUArrays.jl lib/GPUArraysCore
5466
- name: Install dependencies
55-
run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
67+
run: julia --project=docs/ -e 'using Pkg; Pkg.instantiate()'
5668
- name: Build and deploy
5769
env:
5870
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1+
Manifest.toml
2+
13
*.jl.cov
24
*.jl.*.cov
35
*.jl.mem
46

57
# editor generated files
8+
*.orig
69
.*.swp
710
.*.swo
811
*~
12+
13+
# MacOS generated files
14+
*.DS_Store

0 commit comments

Comments
 (0)