Skip to content

Commit 12b3cd0

Browse files
author
Matthias Koefferlein
committed
Merge branch 'master' into devel
2 parents d60b296 + 1feffe7 commit 12b3cd0

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797

9898
- uses: actions/upload-artifact@v4
9999
with:
100-
name: artifact-${{ matrix.os }}-${{ matrix.cibw_arch }}-${{ strategy.job-index }}
100+
name: artifact-sdist
101101
path: dist/*.tar.gz
102102

103103
upload_to_test_pypy:
@@ -106,7 +106,7 @@ jobs:
106106
steps:
107107
- uses: actions/download-artifact@v4
108108
with:
109-
name: artifact-${{ matrix.os }}-${{ matrix.cibw_arch }}-${{ strategy.job-index }}
109+
merge-multiple: true
110110
path: dist
111111

112112
- uses: pypa/gh-action-pypi-publish@v1.12.4
@@ -123,7 +123,7 @@ jobs:
123123
steps:
124124
- uses: actions/download-artifact@v4
125125
with:
126-
name: artifact-${{ matrix.os }}-${{ matrix.cibw_arch }}-${{ strategy.job-index }}
126+
merge-multiple: true
127127
path: dist
128128

129129
- uses: pypa/gh-action-pypi-publish@v1.12.4

azure-pipelines.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ jobs:
9292
displayName: 'Download and Extract KLayout bits'
9393

9494
- script: |
95-
python -m pip install --upgrade pip setuptools wheel
95+
# setuptools 67.0.0 is not working as of now (pypa/setuptools#4885)
96+
python -m pip install --upgrade pip "setuptools<76.0.0" wheel
9697
displayName: 'Update pip, setuptools and wheel'
9798
9899
- script: |

macbuild/build4mac_env.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192
# install with 'sudo port install ruby33'
193193
# [Key Type Name] = 'MP33'
194194
Ruby33MacPorts = { 'exe': '/opt/local/bin/ruby3.3',
195-
'inc': '/opt/local/include/ruby-3.3.6',
195+
'inc': '/opt/local/include/ruby-3.3.7',
196196
'lib': '/opt/local/lib/libruby.3.3.dylib'
197197
}
198198

0 commit comments

Comments
 (0)