Skip to content

Commit 9362f93

Browse files
evelyne-ringootevelyne-ringoot
committed
Merge branch 'master' into QR_views
2 parents f53aa9b + 55a42cf commit 9362f93

File tree

9 files changed

+319
-87
lines changed

9 files changed

+319
-87
lines changed

‎.github/workflows/ManifestUpdater.yml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
name: ManifestUpdater
2+
3+
on:
4+
schedule:
5+
- cron: '0 0 * * 1'
6+
workflow_dispatch:
7+
8+
jobs:
9+
ManifestUpdater:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
- name: Get Julia compatibility
14+
id: julia_compat
15+
# NOTE: this requires a Julia compat lower-bound with minor version!
16+
run : |
17+
version=$(grep '^julia = ' Project.toml | grep -o '".*"' | cut -d '"' -f2)
18+
echo "::set-output name=version::$version"
19+
- uses: julia-actions/setup-julia@v1
20+
with:
21+
version: ${{ steps.julia_compat.outputs.version }}
22+
- name: Update packages
23+
id: pkg_update
24+
run: |
25+
log=$(julia --project -e 'using Pkg; Pkg.update()')
26+
log="${log//'%'/'%25'}"
27+
log="${log//$'\n'/'%0A'}"
28+
log="${log//$'\r'/'%0D'}"
29+
echo "::set-output name=log::$log"
30+
- name: Get status
31+
id: pkg_status
32+
run: |
33+
log=$(julia --project -e 'using Pkg; VERSION >= v"1.3" ? Pkg.status(diff=true) : Pkg.status()')
34+
log="${log//'%'/'%25'}"
35+
log="${log//$'\n'/'%0A'}"
36+
log="${log//$'\r'/'%0D'}"
37+
echo "::set-output name=log::$log"
38+
- name: Get Julia version
39+
id: version
40+
run: |
41+
log=$(julia -e "println(Base.VERSION)")
42+
echo "::set-output name=log::$log"
43+
- name: Create pull request
44+
uses: peter-evans/create-pull-request@v3
45+
with:
46+
token: ${{ secrets.GITHUB_TOKEN }}
47+
commit-message: |
48+
Update dependencies.
49+
50+
${{ steps.pkg_status.outputs.log }}
51+
title: Update manifest
52+
reviewers: maleadt
53+
body: |
54+
This pull request updates the manifest for Julia v${{ steps.version.outputs.log }}:
55+
56+
```
57+
${{ steps.pkg_status.outputs.log }}
58+
```
59+
60+
<details><summary>Click here for the full update log.</summary>
61+
<p>
62+
63+
```
64+
${{ steps.pkg_update.outputs.log }}
65+
```
66+
67+
</p>
68+
</details>
69+
branch: update_manifest
70+

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
version: ['1.6', '^1.7', '^1.8', 'nightly']
17+
version: ['1.6', '1.7', '1.8', '1.9', 'nightly']
1818
os: [ubuntu-latest, macOS-latest, windows-latest]
1919
arch: [x64]
2020
steps:

‎Manifest.toml

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# This file is machine-generated - editing it directly is not advised
22

33
[[Adapt]]
4-
deps = ["LinearAlgebra"]
5-
git-tree-sha1 = "af92965fb30777147966f58acb05da51c5616b5f"
4+
deps = ["LinearAlgebra", "Requires"]
5+
git-tree-sha1 = "76289dc51920fdc6e0013c872ba9551d54961c24"
66
uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
7-
version = "3.3.3"
7+
version = "3.6.2"
88

99
[[ArgTools]]
1010
uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
@@ -16,9 +16,9 @@ uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
1616
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
1717

1818
[[CEnum]]
19-
git-tree-sha1 = "215a9aa4a1f23fbd05b92769fdd62559488d70e9"
19+
git-tree-sha1 = "eb4cb44a499229b3b8426dcfb5dd85333951ff90"
2020
uuid = "fa961155-64e5-5f13-b03f-caf6b980ea82"
21-
version = "0.4.1"
21+
version = "0.4.2"
2222

2323
[[Dates]]
2424
deps = ["Printf"]
@@ -32,29 +32,33 @@ uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
3232
deps = ["Adapt"]
3333
path = "lib/GPUArraysCore"
3434
uuid = "46192b85-c4d5-4398-a991-12ede77f4527"
35-
version = "0.1.4"
35+
version = "0.1.5"
3636

3737
[[InteractiveUtils]]
3838
deps = ["Markdown"]
3939
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
4040

4141
[[JLLWrappers]]
4242
deps = ["Preferences"]
43-
git-tree-sha1 = "22df5b96feef82434b07327e2d3c770a9b21e023"
43+
git-tree-sha1 = "abc9885a7ca2052a736a600f7fa66209f96506e1"
4444
uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
45-
version = "1.4.0"
45+
version = "1.4.1"
4646

4747
[[LLVM]]
4848
deps = ["CEnum", "LLVMExtra_jll", "Libdl", "Printf", "Unicode"]
49-
git-tree-sha1 = "f8dcd7adfda0dddaf944e62476d823164cccc217"
49+
git-tree-sha1 = "7d5788011dd273788146d40eb5b1fbdc199d0296"
5050
uuid = "929cbde3-209d-540e-8aea-75f648917ca0"
51-
version = "4.7.1"
51+
version = "6.0.1"
5252

5353
[[LLVMExtra_jll]]
54-
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
55-
git-tree-sha1 = "67cc5406b15bd04ff72a45f628bec61d36078908"
54+
deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"]
55+
git-tree-sha1 = "1222116d7313cdefecf3d45a2bc1a89c4e7c9217"
5656
uuid = "dad2f222-ce93-54a1-a47d-0025e8a3acab"
57-
version = "0.0.13+3"
57+
version = "0.0.22+0"
58+
59+
[[LazyArtifacts]]
60+
deps = ["Artifacts", "Pkg"]
61+
uuid = "4af54fe1-eca0-43a8-85a7-787d91b784e3"
5862

5963
[[LibCURL]]
6064
deps = ["LibCURL_jll", "MozillaCACerts_jll"]
@@ -102,9 +106,9 @@ uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
102106

103107
[[Preferences]]
104108
deps = ["TOML"]
105-
git-tree-sha1 = "2cf929d64681236a2e074ffafb8d568733d2e6af"
109+
git-tree-sha1 = "7eb1686b4f04b82f96ed7a4ea5890a4f0c7a09f1"
106110
uuid = "21216c6a-2e73-6563-6e65-726566657250"
107-
version = "1.2.3"
111+
version = "1.4.0"
108112

109113
[[Printf]]
110114
deps = ["Unicode"]
@@ -123,6 +127,12 @@ git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b"
123127
uuid = "189a3867-3050-52da-a836-e630ba90ab69"
124128
version = "1.2.2"
125129

130+
[[Requires]]
131+
deps = ["UUIDs"]
132+
git-tree-sha1 = "838a3a4188e2ded87a4f9f184b4b0d78a1e91cb7"
133+
uuid = "ae029012-a4dd-5104-9daa-d747884805df"
134+
version = "1.3.0"
135+
126136
[[SHA]]
127137
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
128138

‎Project.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "GPUArrays"
22
uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7"
3-
version = "8.6.6"
3+
version = "8.8.1"
44

55
[deps]
66
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
@@ -15,7 +15,7 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
1515

1616
[compat]
1717
Adapt = "2.0, 3.0"
18-
GPUArraysCore = "= 0.1.4"
19-
LLVM = "3.9, 4, 5"
18+
GPUArraysCore = "= 0.1.5"
19+
LLVM = "3.9, 4, 5, 6"
2020
Reexport = "1"
2121
julia = "1.6"

‎lib/GPUArraysCore/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "GPUArraysCore"
22
uuid = "46192b85-c4d5-4398-a991-12ede77f4527"
33
authors = ["Tim Besard <tim.besard@gmail.com>"]
4-
version = "0.1.4"
4+
version = "0.1.5"
55

66
[deps]
77
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"

0 commit comments

Comments
 (0)