Skip to content

Commit 4f54226

Browse files
feltechfeltech
authored
Merge pull request OpenAssetIO#94 from feltech/work/macosCI
[CI] Use x86 MacOS for tests
2 parents b356f0e + 9b64fad commit 4f54226

File tree

4 files changed

+40
-38
lines changed

4 files changed

+40
-38
lines changed

‎.github/workflows/examples.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
os: ["windows-latest", "ubuntu-latest", "macos-latest"]
19+
os: ["windows-latest", "ubuntu-latest", "macos-13"]
2020
python: ["3.7", "3.9", "3.10"]
2121
steps:
2222
- uses: actions/checkout@v3

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
fail-fast: false
2929
matrix:
30-
os: ["windows-latest", "ubuntu-latest", "macos-latest"]
30+
os: ["windows-latest", "ubuntu-latest", "macos-13"]
3131
python: ["3.7", "3.9", "3.10"]
3232
steps:
3333
- uses: actions/checkout@v3

‎examples/management_policies.ipynb‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@
3636
"metadata": {
3737
"collapsed": false,
3838
"ExecuteTime": {
39-
"end_time": "2024-01-30T18:11:38.083252222Z",
40-
"start_time": "2024-01-30T18:11:38.027702394Z"
39+
"end_time": "2024-03-13T07:56:17.566800Z",
40+
"start_time": "2024-03-13T07:56:17.527306Z"
4141
}
4242
},
4343
"id": "320f8ec6b0f6ea91",
44-
"execution_count": 28
44+
"execution_count": 1
4545
},
4646
{
4747
"cell_type": "markdown",
@@ -96,7 +96,7 @@
9696
"outputs": [
9797
{
9898
"data": {
99-
"text/markdown": "> **Result:**\n> `{'openassetio-mediacreation:threeDimensional.Spatial', 'openassetio-mediacreation:content.LocatableContent', 'openassetio-mediacreation:usage.Entity', 'openassetio-mediacreation:threeDimensional.Geometry'}`"
99+
"text/markdown": "> **Result:**\n> `{'openassetio-mediacreation:threeDimensional.Geometry', 'openassetio-mediacreation:threeDimensional.Spatial', 'openassetio-mediacreation:usage.Entity', 'openassetio-mediacreation:content.LocatableContent'}`"
100100
},
101101
"metadata": {},
102102
"output_type": "display_data"
@@ -112,12 +112,12 @@
112112
"metadata": {
113113
"collapsed": false,
114114
"ExecuteTime": {
115-
"end_time": "2024-01-30T18:11:38.085519931Z",
116-
"start_time": "2024-01-30T18:11:38.083540633Z"
115+
"end_time": "2024-03-13T07:56:17.571179Z",
116+
"start_time": "2024-03-13T07:56:17.567945Z"
117117
}
118118
},
119119
"id": "2bae30e4867eeda5",
120-
"execution_count": 29
120+
"execution_count": 2
121121
},
122122
{
123123
"cell_type": "markdown",
@@ -138,7 +138,7 @@
138138
"outputs": [
139139
{
140140
"data": {
141-
"text/markdown": "> **Result:**\n> `{'openassetio-mediacreation:managementPolicy.Managed', 'openassetio-mediacreation:content.LocatableContent'}`"
141+
"text/markdown": "> **Result:**\n> `{'openassetio-mediacreation:content.LocatableContent', 'openassetio-mediacreation:managementPolicy.Managed'}`"
142142
},
143143
"metadata": {},
144144
"output_type": "display_data"
@@ -156,12 +156,12 @@
156156
"metadata": {
157157
"collapsed": false,
158158
"ExecuteTime": {
159-
"end_time": "2024-01-30T18:11:38.094002337Z",
160-
"start_time": "2024-01-30T18:11:38.087824298Z"
159+
"end_time": "2024-03-13T07:56:17.577252Z",
160+
"start_time": "2024-03-13T07:56:17.572127Z"
161161
}
162162
},
163163
"id": "ab5b8d3b8748b804",
164-
"execution_count": 30
164+
"execution_count": 3
165165
},
166166
{
167167
"cell_type": "markdown",
@@ -201,12 +201,12 @@
201201
"metadata": {
202202
"collapsed": false,
203203
"ExecuteTime": {
204-
"end_time": "2024-01-30T18:11:38.143527731Z",
205-
"start_time": "2024-01-30T18:11:38.091712050Z"
204+
"end_time": "2024-03-13T07:56:17.582858Z",
205+
"start_time": "2024-03-13T07:56:17.578628Z"
206206
}
207207
},
208208
"id": "4c355b5a8961023a",
209-
"execution_count": 31
209+
"execution_count": 4
210210
},
211211
{
212212
"cell_type": "markdown",
@@ -243,7 +243,7 @@
243243
"outputs": [
244244
{
245245
"data": {
246-
"text/markdown": "> **Result:**\n> `{'openassetio-mediacreation:color.OCIOColorManaged', 'openassetio-mediacreation:twoDimensional.Image', 'openassetio-mediacreation:content.LocatableContent', 'openassetio-mediacreation:twoDimensional.PixelBased', 'openassetio-mediacreation:twoDimensional.Planar', 'openassetio-mediacreation:usage.Entity'}`"
246+
"text/markdown": "> **Result:**\n> `{'openassetio-mediacreation:color.OCIOColorManaged', 'openassetio-mediacreation:twoDimensional.PixelBased', 'openassetio-mediacreation:content.LocatableContent', 'openassetio-mediacreation:twoDimensional.Planar', 'openassetio-mediacreation:twoDimensional.Image', 'openassetio-mediacreation:usage.Entity'}`"
247247
},
248248
"metadata": {},
249249
"output_type": "display_data"
@@ -262,12 +262,12 @@
262262
"metadata": {
263263
"collapsed": false,
264264
"ExecuteTime": {
265-
"end_time": "2024-01-30T18:11:38.164101712Z",
266-
"start_time": "2024-01-30T18:11:38.106695007Z"
265+
"end_time": "2024-03-13T07:56:17.590902Z",
266+
"start_time": "2024-03-13T07:56:17.583884Z"
267267
}
268268
},
269269
"id": "f554b02d92aa8091",
270-
"execution_count": 32
270+
"execution_count": 5
271271
},
272272
{
273273
"cell_type": "markdown",
@@ -290,7 +290,7 @@
290290
"outputs": [
291291
{
292292
"data": {
293-
"text/markdown": "> **Result:**\n> `{'openassetio-mediacreation:color.OCIOColorManaged', 'openassetio-mediacreation:twoDimensional.PixelBased', 'openassetio-mediacreation:managementPolicy.Managed', 'openassetio-mediacreation:content.LocatableContent'}`"
293+
"text/markdown": "> **Result:**\n> `{'openassetio-mediacreation:content.LocatableContent', 'openassetio-mediacreation:color.OCIOColorManaged', 'openassetio-mediacreation:twoDimensional.PixelBased', 'openassetio-mediacreation:managementPolicy.Managed'}`"
294294
},
295295
"metadata": {},
296296
"output_type": "display_data"
@@ -307,12 +307,12 @@
307307
"metadata": {
308308
"collapsed": false,
309309
"ExecuteTime": {
310-
"end_time": "2024-01-30T18:11:38.164577993Z",
311-
"start_time": "2024-01-30T18:11:38.149463152Z"
310+
"end_time": "2024-03-13T07:56:17.596280Z",
311+
"start_time": "2024-03-13T07:56:17.591911Z"
312312
}
313313
},
314314
"id": "15e1be1277309b62",
315-
"execution_count": 33
315+
"execution_count": 6
316316
},
317317
{
318318
"cell_type": "markdown",
@@ -331,7 +331,7 @@
331331
"outputs": [
332332
{
333333
"data": {
334-
"text/markdown": "> **Result:**\n> `{'openassetio-mediacreation:color.OCIOColorManaged', 'openassetio-mediacreation:content.LocatableContent', 'openassetio-mediacreation:managementPolicy.Managed'}`"
334+
"text/markdown": "> **Result:**\n> `{'openassetio-mediacreation:color.OCIOColorManaged', 'openassetio-mediacreation:managementPolicy.Managed', 'openassetio-mediacreation:content.LocatableContent'}`"
335335
},
336336
"metadata": {},
337337
"output_type": "display_data"
@@ -345,12 +345,12 @@
345345
"metadata": {
346346
"collapsed": false,
347347
"ExecuteTime": {
348-
"end_time": "2024-01-30T18:11:38.164953871Z",
349-
"start_time": "2024-01-30T18:11:38.149610878Z"
348+
"end_time": "2024-03-13T07:56:17.601397Z",
349+
"start_time": "2024-03-13T07:56:17.597131Z"
350350
}
351351
},
352352
"id": "8059d9533bf54deb",
353-
"execution_count": 34
353+
"execution_count": 7
354354
},
355355
{
356356
"cell_type": "markdown",
@@ -373,7 +373,7 @@
373373
"outputs": [
374374
{
375375
"data": {
376-
"text/markdown": "> **Result:**\n> `{'openassetio-mediacreation:managementPolicy.Managed', 'openassetio-mediacreation:content.LocatableContent'}`"
376+
"text/markdown": "> **Result:**\n> `{'openassetio-mediacreation:content.LocatableContent', 'openassetio-mediacreation:managementPolicy.Managed'}`"
377377
},
378378
"metadata": {},
379379
"output_type": "display_data"
@@ -388,12 +388,12 @@
388388
"metadata": {
389389
"collapsed": false,
390390
"ExecuteTime": {
391-
"end_time": "2024-01-30T18:11:38.214093687Z",
392-
"start_time": "2024-01-30T18:11:38.149684272Z"
391+
"end_time": "2024-03-13T07:56:17.607209Z",
392+
"start_time": "2024-03-13T07:56:17.602157Z"
393393
}
394394
},
395395
"id": "ed1fb267bbf648ae",
396-
"execution_count": 35
396+
"execution_count": 8
397397
},
398398
{
399399
"cell_type": "markdown",
@@ -527,12 +527,12 @@
527527
"metadata": {
528528
"collapsed": false,
529529
"ExecuteTime": {
530-
"end_time": "2024-01-30T18:11:38.214899040Z",
531-
"start_time": "2024-01-30T18:11:38.197534761Z"
530+
"end_time": "2024-03-13T07:56:17.648865Z",
531+
"start_time": "2024-03-13T07:56:17.608546Z"
532532
}
533533
},
534534
"id": "4b129ad13007c541",
535-
"execution_count": 36
535+
"execution_count": 9
536536
}
537537
],
538538
"metadata": {

‎examples/resources/management_policies/bal_database.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,12 @@
3636
"openassetio-mediacreation:content.LocatableContent": {
3737
"location": "file:///mnt/staging/renders/myrender.exr"
3838
}
39-
},
40-
"supported_access_modes": ["managerDriven"]
39+
}
4140
}
42-
]
41+
],
42+
"overrideByAccess": {
43+
"read": null
44+
}
4345
}
4446
}
4547
}

0 commit comments

Comments
 (0)