Skip to content

Commit d487939

Browse files
authored
Merge pull request #874 from maresb/update-ci
Exclude broken Dulwich version and update CI dependencies
2 parents 2f11b6c + ffe13fe commit d487939

10 files changed

Lines changed: 32 additions & 32 deletions

File tree

.github/workflows/integration-test.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ jobs:
5151
- name: Verify Conda platform
5252
run: echo "Conda platform is $CONDA_PLATFORM"
5353

54-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
54+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5555
with:
5656
persist-credentials: false
5757
- name: Set up Python
58-
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
58+
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
5959
with:
6060
python-version: ${{ matrix.python-version }}
6161
- name: install conda-lock
@@ -73,7 +73,7 @@ jobs:
7373
mkdir lockfiles
7474
mv conda-$CONDA_PLATFORM.lock conda-$CONDA_PLATFORM.lock.yml conda-lock.yml lockfiles
7575
- name: Upload lockfiles
76-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
76+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
7777
with:
7878
name: conda-lock-${{ matrix.os }}-${{ matrix.python-version }}
7979
path: lockfiles
@@ -108,7 +108,7 @@ jobs:
108108
# micromamba-url: https://github.com/mamba-org/micromamba-releases/releases/download/${{ env.MICROMAMBA_VERSION }}/micromamba-${{ env.CONDA_PLATFORM }}
109109
init-shell: bash
110110
- name: Download lockfiles
111-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
111+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
112112
with:
113113
name: conda-lock-${{ matrix.os }}-${{ matrix.python-version }}
114114
path: lockfiles
@@ -137,7 +137,7 @@ jobs:
137137
os: [ ubuntu-latest, macos-latest, windows-latest ]
138138
python-version: [ "3.10", "3.14" ]
139139
steps:
140-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
140+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
141141
with:
142142
persist-credentials: false
143143
- uses: conda-incubator/setup-miniconda@835234971496cad1653abb28a638a281cf32541f # v3.2.0
@@ -149,7 +149,7 @@ jobs:
149149
pip install pipx
150150
pipx install -e .
151151
- name: Download lockfiles
152-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
152+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
153153
with:
154154
name: conda-lock-${{ matrix.os }}-${{ matrix.python-version }}
155155
path: lockfiles
@@ -189,7 +189,7 @@ jobs:
189189
auto-activate-base: true
190190
python-version: ${{ matrix.python-version }}
191191
- name: Download lockfiles
192-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
192+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
193193
with:
194194
name: conda-lock-${{ matrix.os }}-${{ matrix.python-version }}
195195
path: lockfiles

.github/workflows/mkdocs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
permissions:
2626
contents: write # for mkdocs gh-deploy to push to gh-pages branch
2727
steps:
28-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
28+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2929
with:
3030
submodules: "recursive"
3131
fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod
@@ -48,7 +48,7 @@ jobs:
4848

4949
- run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
5050

51-
- uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
51+
- uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
5252
with:
5353
key: mkdocs-material-${{ env.cache_id }}
5454
path: .cache

.github/workflows/release.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ jobs:
1717
contents: read
1818
actions: write # for uploading artifacts
1919
steps:
20-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
20+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2121
with:
2222
fetch-depth: 0
2323
persist-credentials: false
2424

2525
- name: Set up Python
26-
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
26+
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
2727
with:
2828
python-version: "3.10"
2929

@@ -43,7 +43,7 @@ jobs:
4343
shell: bash
4444

4545
- name: Upload dist files for publication
46-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
46+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
4747
with:
4848
name: dist-files
4949
path: dist
@@ -59,7 +59,7 @@ jobs:
5959
id-token: write # for trusted publishing to PyPI
6060
actions: read # for downloading artifacts
6161
steps:
62-
- uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
62+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
6363
with:
6464
name: dist-files
6565
path: dist

.github/workflows/test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
PYTHONUNBUFFERED: "1"
8989
FORCE_COLOR: "1"
9090
steps:
91-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
91+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
9292
with:
9393
fetch-depth: 0
9494
persist-credentials: false
@@ -150,7 +150,7 @@ jobs:
150150
--splits="${{ matrix.pytest-split-group-size }}" \
151151
--group="${{ matrix.pytest-split-group-index }}"
152152
153-
- uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
153+
- uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
154154
with:
155155
token: ${{ secrets.CODECOV_TOKEN }}
156156

@@ -160,7 +160,7 @@ jobs:
160160
cat tests/durations/${{ matrix.os }}-py${{ matrix.python-version }}.json
161161
162162
- name: Store test durations
163-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
163+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
164164
with:
165165
name: test-durations-${{ matrix.os }}-py${{ matrix.python-version }}-${{ matrix.pytest-split-group-index }}
166166
path: tests/durations/${{ matrix.os }}-py${{ matrix.python-version }}.json
@@ -174,7 +174,7 @@ jobs:
174174
actions: write # for downloading and uploading artifacts
175175
steps:
176176
- name: Download test durations
177-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
177+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
178178
# All the artifacts are downloaded into various subdirectories.
179179
# For each filename that occurs, we need to find all the files in the
180180
# subdirectories with the same name, group those, and merge them.
@@ -191,7 +191,7 @@ jobs:
191191
jq -s 'add | to_entries | sort_by(.key) | from_entries' $(find . -type f -name "$filename") > "aggregated/$filename"
192192
done < temp/filenames.txt
193193
- name: Upload aggregated test durations
194-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
194+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
195195
with:
196196
name: aggregated-test-durations
197197
path: aggregated

.github/workflows/typecheck.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ jobs:
4343
os: ubuntu-latest
4444
steps:
4545
# Initialization
46-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
46+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4747
with:
4848
fetch-depth: 0
4949
persist-credentials: false
50-
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
50+
- uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
5151
if: matrix.setup-micromamba == false
5252
with:
5353
python-version: 3.14
@@ -82,7 +82,7 @@ jobs:
8282
# Upload logs
8383
- name: Upload pre-commit log
8484
if: always()
85-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
85+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
8686
with:
8787
name: pre-commit-${{ matrix.name }}.log
8888
path: /home/runner/.cache/pre-commit/pre-commit.log

.github/workflows/update-lockfile.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
contents: read
2929
actions: write # for uploading artifacts
3030
steps:
31-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
31+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3232
with:
3333
persist-credentials: false
3434
- name: Install Micromamba
@@ -51,7 +51,7 @@ jobs:
5151
--lockfile=environments/conda-lock-python-${PYTHON_VERSION}.yaml
5252
5353
- name: Upload lockfile
54-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
54+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
5555
with:
5656
name: conda-lock-python-${{ matrix.python-version }}
5757
path: environments/conda-lock-python-${{ matrix.python-version }}.yaml
@@ -64,17 +64,17 @@ jobs:
6464
pull-requests: write # for creating pull requests
6565
actions: read # for downloading artifacts
6666
steps:
67-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
67+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
6868
with:
6969
persist-credentials: false
7070

7171
- name: Download all lockfiles
72-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
72+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
7373
with:
7474
path: environments/
7575

7676
- name: Open a pull request
77-
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
77+
uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v8.0.0
7878
with:
7979
# # The default GITHUB_TOKEN doesn't allow other workflows to trigger.
8080
# # Thus if there are tests to be run, they won't be run. For more info,

.github/workflows/update.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
echo "REPOSITORY=${REPOSITORY}" >> $GITHUB_ENV
5555
echo "REF=${REF}" >> $GITHUB_ENV
5656
57-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
57+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5858
with:
5959
repository: ${{ env.REPOSITORY || github.repository }}
6060
ref: ${{ env.REF || '' }}
@@ -91,7 +91,7 @@ jobs:
9191
- if: github.event.comment.body != '@conda-bot render'
9292
id: create
9393
# no-op if no commits were made
94-
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
94+
uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v8.0.0
9595
with:
9696
push-to-fork: ${{ env.FORK }}
9797
token: ${{ secrets.SYNC_TOKEN }}

.github/workflows/zizmor.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
actions: read # only needed for private repos
1818
steps:
1919
- name: Checkout repository
20-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
20+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2121
with:
2222
persist-credentials: false
2323

2424
- name: Run zizmor 🌈
25-
uses: zizmorcore/zizmor-action@e673c3917a1aef3c65c972347ed84ccd013ecda4 # v0.2.0
25+
uses: zizmorcore/zizmor-action@e639db99335bc9038abc0e066dfcd72e23d26fb4 # v0.3.0
2626
with:
2727
persona: pedantic

pixi.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ charset-normalizer = "*"
1717
click = ">=8.0"
1818
click-default-group = "*"
1919
crashtest = "<0.5.0,>=0.4.1"
20-
dulwich = ">=0.22.6"
20+
dulwich = "<0.25,>=0.22.6"
2121
ensureconda = ">=1.4.7"
2222
filelock = "*"
2323
gitpython = ">=3.1.30"

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ dependencies = [
7777
"build >=1.2.1,<2.0.0",
7878
"cachecontrol[filecache] >=0.14.0,<0.15.0",
7979
"crashtest >=0.4.1,<0.5.0",
80-
"dulwich >=0.22.6",
80+
"dulwich >=0.22.6,<0.25",
8181
"fastjsonschema >=2.18.0,<3.0.0",
8282
'importlib-metadata >= 4.4 ; python_version <"3.10"',
8383
"installer >=0.7.0,<0.8.0",

0 commit comments

Comments
 (0)