Skip to content

Commit c9d13bc

Browse files
authored
Merge branch 'main' into lightbug-0-25-7
2 parents b616fb5 + 80f1253 commit c9d13bc

File tree

10 files changed

+234
-155
lines changed

10 files changed

+234
-155
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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
21+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2222
with:
2323
fetch-depth: 2
24-
- uses: prefix-dev/setup-pixi@194d461b21b6c5717c722ffc597fa91ed2ff29fa # v0.9.1
24+
- uses: prefix-dev/setup-pixi@82d477f15f3a381dbcc8adc1206ce643fe110fb7 # v0.9.3
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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
25+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2626
with:
2727
fetch-depth: 2
28-
- uses: prefix-dev/setup-pixi@194d461b21b6c5717c722ffc597fa91ed2ff29fa # v0.9.1
28+
- uses: prefix-dev/setup-pixi@82d477f15f3a381dbcc8adc1206ce643fe110fb7 # v0.9.3
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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
14-
- uses: prefix-dev/setup-pixi@194d461b21b6c5717c722ffc597fa91ed2ff29fa # v0.9.1
13+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
14+
- uses: prefix-dev/setup-pixi@82d477f15f3a381dbcc8adc1206ce643fe110fb7 # v0.9.3
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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
16+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
1717
with:
1818
fetch-depth: 2
19-
- uses: prefix-dev/setup-pixi@194d461b21b6c5717c722ffc597fa91ed2ff29fa # v0.9.1
19+
- uses: prefix-dev/setup-pixi@82d477f15f3a381dbcc8adc1206ce643fe110fb7 # v0.9.3
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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
17+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
1818
with:
1919
fetch-depth: 2
20-
- uses: prefix-dev/setup-pixi@194d461b21b6c5717c722ffc597fa91ed2ff29fa # v0.9.1
20+
- uses: prefix-dev/setup-pixi@82d477f15f3a381dbcc8adc1206ce643fe110fb7 # v0.9.3
2121
with:
2222
pixi-version: v0.37.0
2323

.github/workflows/update-lockfiles.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ jobs:
1313
pixi-update:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
16+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
1717
- name: Set up pixi
18-
uses: prefix-dev/setup-pixi@194d461b21b6c5717c722ffc597fa91ed2ff29fa # v0.9.1
18+
uses: prefix-dev/setup-pixi@82d477f15f3a381dbcc8adc1206ce643fe110fb7 # v0.9.3
1919
with:
2020
run-install: false
2121
- name: Update lockfiles
2222
run: |
2323
set -euo pipefail
2424
pixi update --json --no-install | pixi exec pixi-diff-to-markdown >> diff.md
2525
- name: Create pull request
26-
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
26+
uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v8.0.0
2727
with:
2828
token: ${{ secrets.GITHUB_TOKEN }}
2929
commit-message: Update pixi lockfile

recipes/decimojo/README.md

Lines changed: 178 additions & 111 deletions
Large diffs are not rendered by default.

recipes/decimojo/recipe.yaml

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,28 @@
11
context:
2-
version: "0.4.1"
2+
version: "0.6.0"
3+
mojo_version: "=0.25.7"
34

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

89
source:
910
- git: https://github.com/forFudan/decimojo.git
10-
rev: 51c983229749df1caf490ccb9ddea19e7f220441
11+
rev: 0fab1a2349cf05b854c4c204ec2121f634396809
1112

1213
build:
1314
number: 0
1415
script:
16+
- mkdir -p ${PREFIX}/lib/mojo
1517
- mojo package src/decimojo -o ${{ PREFIX }}/lib/mojo/decimojo.mojopkg
18+
1619
requirements:
1720
host:
18-
- max=25.4
21+
- mojo-compiler ${{ mojo_version }}
22+
build:
23+
- mojo-compiler ${{ mojo_version }}
1924
run:
20-
- ${{ pin_compatible('max') }}
21-
22-
tests:
23-
- script:
24-
- if: unix
25-
then:
26-
- mojo run tests.mojo
27-
requirements:
28-
run:
29-
- max=25.4
30-
files:
31-
recipe:
32-
- tests.mojo
25+
- mojo-compiler ${{ mojo_version }}
3326

3427
about:
3528
homepage: https://github.com/forFudan/decimojo.git

recipes/mist/recipe.yaml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,41 @@
11
context:
2-
version: "25.5.0"
2+
version: "25.7.0"
3+
mojo_version: "=0.25.7"
34

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

89
source:
910
- git: https://github.com/thatstoasty/mist.git
10-
rev: 1c89c766f2827607c2fe64cfdc13b8680d55d6c0
11+
rev: 60788f6603930a099954a255c918492a7648bf41
1112

1213
build:
1314
number: 0
1415
script:
1516
- mojo package mist -o ${{ PREFIX }}/lib/mojo/mist.mojopkg
1617
requirements:
18+
build:
19+
- mojo-compiler ${{ mojo_version }}
1720
host:
18-
- max =25.5
21+
- mojo-compiler ${{ mojo_version }}
1922
run:
20-
- ${{ pin_compatible('max') }}
23+
- mojo-compiler ${{ mojo_version }}
2124

2225
tests:
2326
- script:
2427
- if: unix
2528
then:
26-
- mojo test test
29+
- sh -c 'find ./test -name test_*.mojo | xargs -I % pixi run mojo run -I . -D ASSERT=all %'
30+
requirements:
31+
build:
32+
- mojo ${{ mojo_version }}
33+
run:
34+
- mojo ${{ mojo_version }}
35+
files:
36+
source:
37+
- mist/
38+
- test/
2739

2840
about:
2941
homepage: https://github.com/thatstoasty/mist

recipes/small_time/recipe.yaml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,41 @@
11
context:
2-
version: "25.4.1"
2+
version: "25.7.0"
3+
mojo_version: "=0.25.7"
34

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

89
source:
910
- git: https://github.com/thatstoasty/small-time.git
10-
rev: 5eb887d8efcf2d401d7ebef82f332550bcffbdb9
11+
rev: 0dbf6349ef13d7009abca777702146b1438ff5fe
1112

1213
build:
1314
number: 0
1415
script:
15-
- mojo package src/small_time -o ${{ PREFIX }}/lib/mojo/small_time.mojopkg
16+
- mojo package small_time -o ${{ PREFIX }}/lib/mojo/small_time.mojopkg
1617
requirements:
18+
build:
19+
- mojo-compiler ${{ mojo_version }}
1720
host:
18-
- max =25.4
21+
- mojo-compiler ${{ mojo_version }}
1922
run:
20-
- ${{ pin_compatible('max') }}
23+
- mojo-compiler ${{ mojo_version }}
2124

2225
tests:
2326
- script:
2427
- if: unix
2528
then:
26-
- mojo test test
29+
- sh -c 'find ./test -name test_*.mojo | xargs -I % pixi run mojo run -I . -D ASSERT=all %'
30+
requirements:
31+
build:
32+
- mojo ${{ mojo_version }}
33+
run:
34+
- mojo ${{ mojo_version }}
2735
files:
28-
recipe:
29-
- test_small_time.mojo
30-
- test_time_delta.mojo
31-
- test_time_zone.mojo
36+
source:
37+
- small_time/
38+
- test/
3239

3340
about:
3441
homepage: https://github.com/thatstoasty/small-time

0 commit comments

Comments
 (0)