Skip to content

Commit 48a9a34

Browse files
sstadicksstadick
authored
Merge branch 'modular:main' into main
2 parents 9d929c1 + d14c2f8 commit 48a9a34

File tree

19 files changed

+209
-172
lines changed

19 files changed

+209
-172
lines changed

‎.github/workflows/build-pr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
- magic_arm64_8core
1919
runs-on: ${{ matrix.label }}
2020
steps:
21-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
21+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2222
with:
2323
fetch-depth: 2
24-
- uses: prefix-dev/setup-pixi@8ca4608ef7f4daeb54f5205b20d0b7cb42f11143 # v0.8.14
24+
- uses: prefix-dev/setup-pixi@194d461b21b6c5717c722ffc597fa91ed2ff29fa # v0.9.1
2525
with:
2626
pixi-version: v0.37.0
2727

‎.github/workflows/build-upload.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
env:
2323
DATA_FILE: data/failed-compatibility-${{ matrix.label }}.json
2424
steps:
25-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
25+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2626
with:
2727
fetch-depth: 2
28-
- uses: prefix-dev/setup-pixi@8ca4608ef7f4daeb54f5205b20d0b7cb42f11143 # v0.8.14
28+
- uses: prefix-dev/setup-pixi@194d461b21b6c5717c722ffc597fa91ed2ff29fa # v0.9.1
2929
with:
3030
pixi-version: v0.37.0
3131

‎.github/workflows/docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
deploy:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
14-
- uses: prefix-dev/setup-pixi@8ca4608ef7f4daeb54f5205b20d0b7cb42f11143 # v0.8.14
13+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
14+
- uses: prefix-dev/setup-pixi@194d461b21b6c5717c722ffc597fa91ed2ff29fa # v0.9.1
1515
with:
1616
pixi-version: v0.37.0
1717

‎.github/workflows/pre-commit.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
pre-commit:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
16+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1717
with:
1818
fetch-depth: 2
19-
- uses: prefix-dev/setup-pixi@8ca4608ef7f4daeb54f5205b20d0b7cb42f11143 # v0.8.14
19+
- uses: prefix-dev/setup-pixi@194d461b21b6c5717c722ffc597fa91ed2ff29fa # v0.9.1
2020
with:
2121
pixi-version: v0.37.0
2222

‎.github/workflows/remove-incompatible-packages.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
17+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1818
with:
1919
fetch-depth: 2
20-
- uses: prefix-dev/setup-pixi@8ca4608ef7f4daeb54f5205b20d0b7cb42f11143 # v0.8.14
20+
- uses: prefix-dev/setup-pixi@194d461b21b6c5717c722ffc597fa91ed2ff29fa # v0.9.1
2121
with:
2222
pixi-version: v0.37.0
2323

‎.github/workflows/update-lockfiles.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
pixi-update:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
16+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1717
- name: Set up pixi
18-
uses: prefix-dev/setup-pixi@8ca4608ef7f4daeb54f5205b20d0b7cb42f11143 # v0.8.14
18+
uses: prefix-dev/setup-pixi@194d461b21b6c5717c722ffc597fa91ed2ff29fa # v0.9.1
1919
with:
2020
run-install: false
2121
- name: Update lockfiles

‎recipes/ExtraMojo/recipe.yaml‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,43 @@
11
context:
2-
version: "0.16.0"
3-
max_version: "=25.4"
2+
version: "0.17.0"
3+
mojo_version: "=25.5"
44

55
package:
66
name: "extramojo"
77
version: ${{ version }}
88

99
source:
1010
- git: https://github.com/ExtraMojo/ExtraMojo.git
11-
rev: 75b80da6249467b9df8f16fa432814b987504126
11+
rev: 608ca09f3b2e201b8c163f466966af48fa99e1c2
1212
# path: .
1313
# use_gitignore: true
1414

1515
build:
1616
number: 0
1717
script:
18-
- mojo package ExtraMojo -o ${{ PREFIX }}/lib/mojo/ExtraMojo.mojopkg
18+
- mojo package extramojo -o ${{ PREFIX }}/lib/mojo/extramojo.mojopkg
1919
requirements:
20+
build:
21+
- mojo-compiler ${{ mojo_version }}
2022
host:
21-
- max ${{ max_version }}
23+
- mojo-compiler ${{ mojo_version }}
2224
run:
23-
- max ${{ max_version }}
25+
- mojo-compiler ${{ mojo_version }}
2426

2527
tests:
2628
- script:
2729
- if: unix
2830
then:
29-
- mojo run -I ${{ PREFIX }}/lib/mojo/ExtraMojo.mojopkg tests/test_file.mojo
30-
- mojo test -I ${{ PREFIX }}/lib/mojo/ExtraMojo.mojopkg tests
31+
- mojo run -I . tests/test_file.mojo
32+
- mojo test -I . tests
3133
requirements:
34+
build:
35+
- mojo ${{ mojo_version }}
3236
run:
33-
- max ${{ max_version }}
37+
- mojo ${{ mojo_version }}
3438
files:
3539
source:
40+
- extramojo/
3641
- tests/
3742

3843
about:

‎recipes/emberjson/recipe.yaml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
context:
2-
version: 0.1.6
2+
version: 0.2.0
3+
mojo_version: "=0.25.6"
34

45
package:
56
name: "emberjson"
67
version: ${{ version }}
78

89
source:
910
- git: https://github.com/bgreni/EmberJson.git
10-
rev: c12f69c21311807ddb998ca1a75be0db0ac2f8dc
11+
rev: 5a456cc8286753d3fcdc5686f0ec48fe2dcee316
1112

1213
build:
1314
number: 0
@@ -16,15 +17,22 @@ build:
1617

1718
requirements:
1819
host:
19-
- max =25.4
20+
- mojo-compiler =0.25.6
21+
build:
22+
- mojo-compiler ${{ mojo_version }}
2023
run:
21-
- ${{ pin_compatible('max') }}
24+
- ${{ pin_compatible('mojo-compiler') }}
2225

2326
tests:
2427
- script:
2528
- if: unix
2629
then:
2730
- mojo test
31+
requirements:
32+
build:
33+
- mojo ${{ mojo_version }}
34+
run:
35+
- mojo ${{ mojo_version }}
2836

2937
about:
3038
homepage: https://github.com/bgreni/EmberJson

‎recipes/kelvin/recipe.yaml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
context:
2-
version: 0.1.1
2+
version: 0.1.3
3+
mojo_version: "=0.25.6"
34

45
package:
56
name: "kelvin"
67
version: ${{ version }}
78

89
source:
910
- git: https://github.com/bgreni/Kelvin.git
10-
rev: e8afbd34e7922e33ab9b5ab75333d1c816cdfe05
11+
rev: d10f89ac05c178e7537906fb5834e10764f3291f
1112

1213
build:
1314
number: 0
@@ -16,9 +17,11 @@ build:
1617

1718
requirements:
1819
host:
19-
- max =25.4
20+
- mojo-compiler ${{ mojo_version }}
21+
build:
22+
- mojo-compiler ${{ mojo_version }}
2023
run:
21-
- ${{ pin_compatible('max') }}
24+
- ${{ pin_compatible('mojo-compiler') }}
2225

2326
tests:
2427
- script:
@@ -27,6 +30,11 @@ tests:
2730
- mojo test
2831
# Can't convince PR build to find this file
2932
# - python3 scripts/run_reject_tests.py
33+
requirements:
34+
build:
35+
- mojo ${{ mojo_version }}
36+
run:
37+
- mojo ${{ mojo_version }}
3038

3139
about:
3240
homepage: https://github.com/bgreni/Kelvin

‎recipes/mist/recipe.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
context:
2-
version: "25.4.0"
2+
version: "25.5.0"
33

44
package:
55
name: "mist"
66
version: ${{ version }}
77

88
source:
99
- git: https://github.com/thatstoasty/mist.git
10-
rev: 6edf8a17c6f2e0dd7bf194f6dc3d032c0b9d091b
10+
rev: 1c89c766f2827607c2fe64cfdc13b8680d55d6c0
1111

1212
build:
1313
number: 0
1414
script:
15-
- mojo package src/mist -o ${{ PREFIX }}/lib/mojo/mist.mojopkg
15+
- mojo package mist -o ${{ PREFIX }}/lib/mojo/mist.mojopkg
1616
requirements:
1717
host:
18-
- max =25.4
18+
- max =25.5
1919
run:
2020
- ${{ pin_compatible('max') }}
2121

0 commit comments

Comments
 (0)