Skip to content

Commit f434ffd

Browse files
glandiumglandium
committed
Merge branch 'master' into release
2 parents b8fb36a + e715d42 commit f434ffd

43 files changed

Lines changed: 435 additions & 372 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/actions/decision/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ runs:
2828
node-version: '20.x'
2929
- shell: bash
3030
if: ${{ steps.decision.outputs.matrix }}
31-
run: npm install @actions/cache
31+
run: npm install @actions/cache@5
3232
- name: Check dependencies
3333
id: matrix
3434
if: ${{ steps.decision.outputs.matrix }}

‎.github/actions/mounts/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ runs:
1111
with:
1212
node-version: '20.x'
1313
- shell: bash
14-
run: npm install @actions/cache
14+
run: npm install @actions/cache@5
1515
- name: Mount dependencies
1616
uses: actions/github-script@v7
1717
with:

‎.github/actions/task/action.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,19 @@ runs:
2828
shell: bash
2929
if: ${{ steps.cache.outputs.cache-hit != 'true' && runner.os == 'macOS' }}
3030
run: echo "PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Frameworks/Python.framework/Versions/2.7/bin:$PATH" >> $GITHUB_ENV
31-
- uses: actions/setup-python@v5
31+
- uses: astral-sh/setup-uv@v6
3232
if: ${{ steps.cache.outputs.cache-hit != 'true' && runner.os == 'macOS' }}
3333
with:
34+
version: '0.9.0'
3435
python-version: ${{ runner.arch == 'ARM64' && '3.11.7' || '3.9.14' }}
36+
activate-environment: true
3537
- name: Finish python setup
3638
if: ${{ steps.cache.outputs.cache-hit != 'true' && runner.os == 'macOS' }}
3739
shell: bash
3840
run: |
39-
python3 -m pip install pip==20.3.4 wheel==0.37.0 --upgrade
41+
uv pip install pip==20.3.4 wheel==0.37.0 --upgrade
4042
- name: ${{ inputs.name }}
4143
shell: bash
4244
if: ${{ steps.cache.outputs.cache-hit != 'true' }}
4345
run: |
44-
python3 CI/run.py --cache cache --no-recurse --out . "${{ inputs.name }}"
46+
${{ runner.os == 'macOS' && 'uv run' || 'python3' }} CI/run.py --cache cache --no-recurse --out . "${{ inputs.name }}"

‎.github/workflows/cargo-deny.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
steps:
2828
- uses: actions/checkout@v4
29-
- uses: EmbarkStudios/cargo-deny-action@v1
29+
- uses: EmbarkStudios/cargo-deny-action@v2
3030
with:
3131
command: check ${{ matrix.checks }}
3232
rust-version: "1.78.0"

‎.github/workflows/cargo-package.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
os: [ubuntu-latest, macos-latest]
21-
toolchain: [1.88.0]
21+
toolchain: [1.93.0]
2222
include:
2323
- os: windows-latest
24-
toolchain: 1.88.0-x86_64-pc-windows-gnu
24+
toolchain: 1.93.0-x86_64-pc-windows-gnu
2525
runs-on: ${{ matrix.os }}
2626
steps:
2727
- uses: actions/checkout@v4
@@ -31,6 +31,7 @@ jobs:
3131
with:
3232
toolchain: ${{ matrix.toolchain }}
3333
- uses: msys2/setup-msys2@v2
34+
id: msys2
3435
with:
3536
release: true
3637
update: false
@@ -41,7 +42,9 @@ jobs:
4142
patch
4243
if: runner.os == 'Windows'
4344
- name: Update PATH
45+
env:
46+
MSYS2_LOCATION: ${{ steps.msys2.outputs.msys2-location }}/mingw64/bin
4447
run: |
45-
(Resolve-Path c:/msys64/mingw64/bin).Path >> $Env:GITHUB_PATH
48+
echo "$Env:MSYS2_LOCATION" >> $Env:GITHUB_PATH
4649
if: runner.os == 'Windows'
4750
- run: cargo package

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: CI
22
on:
3-
push: []
4-
pull_request: []
3+
push: {}
4+
pull_request: {}
55
schedule:
66
- cron: '21 7 * * *'
77
workflow_dispatch:

‎.github/workflows/rust.yml‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ jobs:
66
fail-fast: false
77
matrix:
88
os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest]
9-
toolchain: [1.88.0]
9+
toolchain: [1.93.0]
1010
include:
1111
- os: windows-latest
12-
toolchain: 1.88.0-x86_64-pc-windows-gnu
12+
toolchain: 1.93.0-x86_64-pc-windows-gnu
1313
runs-on: ${{ matrix.os }}
1414
steps:
1515
- uses: actions/checkout@v4
@@ -27,6 +27,7 @@ jobs:
2727
toolchain: ${{ matrix.toolchain }}
2828
components: clippy
2929
- uses: msys2/setup-msys2@v2
30+
id: msys2
3031
with:
3132
release: true
3233
update: false
@@ -37,8 +38,10 @@ jobs:
3738
patch
3839
if: runner.os == 'Windows'
3940
- name: Update PATH
41+
env:
42+
MSYS2_LOCATION: ${{ steps.msys2.outputs.msys2-location }}/mingw64/bin
4043
run: |
41-
(Resolve-Path c:/msys64/mingw64/bin).Path >> $Env:GITHUB_PATH
44+
echo "$Env:MSYS2_LOCATION"/mingw64/bin >> $Env:GITHUB_PATH
4245
if: runner.os == 'Windows'
4346
- uses: actions-rs-plus/clippy-check@v2
4447
with:
@@ -59,7 +62,7 @@ jobs:
5962
- uses: actions/checkout@v4
6063
- uses: dtolnay/rust-toolchain@master
6164
with:
62-
toolchain: 1.88.0
65+
toolchain: 1.93.0
6366
components: rustfmt
6467
- run: cargo fmt -- --check
6568

@@ -68,10 +71,10 @@ jobs:
6871
fail-fast: false
6972
matrix:
7073
os: [ubuntu-latest, macos-latest]
71-
toolchain: [1.88.0, 1.75.0]
74+
toolchain: [1.93.0, 1.75.0]
7275
include:
7376
- os: windows-latest
74-
toolchain: 1.88.0-x86_64-pc-windows-gnu
77+
toolchain: 1.93.0-x86_64-pc-windows-gnu
7578
- os: windows-latest
7679
toolchain: 1.75.0-x86_64-pc-windows-gnu
7780
runs-on: ${{ matrix.os }}
@@ -90,6 +93,7 @@ jobs:
9093
with:
9194
toolchain: ${{ matrix.toolchain }}
9295
- uses: msys2/setup-msys2@v2
96+
id: msys2
9397
with:
9498
release: true
9599
update: false
@@ -100,7 +104,9 @@ jobs:
100104
patch
101105
if: runner.os == 'Windows'
102106
- name: Update PATH
107+
env:
108+
MSYS2_LOCATION: ${{ steps.msys2.outputs.msys2-location }}/mingw64/bin
103109
run: |
104-
(Resolve-Path c:/msys64/mingw64/bin).Path >> $Env:GITHUB_PATH
110+
echo "$Env:MSYS2_LOCATION" >> $Env:GITHUB_PATH
105111
if: runner.os == 'Windows'
106112
- run: cargo test

‎.gitmodules‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[submodule "git-core"]
22
path = git-core
3-
url = https://github.com/git-for-windows/git
3+
url = https://github.com/glandium/git
4+
branch = move-rust

‎CI/decision.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,8 +444,8 @@ def main():
444444

445445
RUNNER = {
446446
"linux": "ubuntu-latest",
447-
"osx": "macos-13",
448-
"macos": "macos-14",
447+
"osx": "macos-15-intel",
448+
"macos": "macos-15",
449449
"windows": "windows-latest",
450450
}
451451
matrix = {}

‎CI/docker.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def sources_list(snapshot, sections):
3232
LLVM_REPO = (
3333
"echo"
3434
" deb [signed-by=/usr/share/keyrings/llvm.gpg]"
35-
" https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-20 main"
35+
" https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-21 main"
3636
" > /etc/apt/sources.list.d/llvm.list"
3737
)
3838

@@ -96,9 +96,9 @@ def sources_list(snapshot, sections):
9696
"apt-get install -y --no-install-recommends {}".format(
9797
" ".join(
9898
[
99-
"clang-20",
100-
"lld-20",
101-
"llvm-20",
99+
"clang-21",
100+
"lld-21",
101+
"llvm-21",
102102
"git",
103103
"make",
104104
"patch",
@@ -179,14 +179,14 @@ def sources_list(snapshot, sections):
179179
"apt-get install -y --no-install-recommends {}".format(
180180
" ".join(
181181
[
182-
"llvm-20",
182+
"llvm-21",
183183
"make",
184184
]
185185
)
186186
),
187187
"apt-get clean",
188188
"pip3 install cram==0.7",
189-
"ln -s llvm-symbolizer-20 /usr/bin/llvm-symbolizer",
189+
"ln -s llvm-symbolizer-21 /usr/bin/llvm-symbolizer",
190190
],
191191
},
192192
}

0 commit comments

Comments
 (0)