From c0f2bdd3d6d025019b2b9abdc5fb8fdd1aeec25d Mon Sep 17 00:00:00 2001 From: Kazunari Sekigawa Date: Sat, 22 Feb 2025 10:09:17 +0900 Subject: [PATCH 1/4] Use Ruby 3.3.7 from MacPorts --- macbuild/build4mac_env.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macbuild/build4mac_env.py b/macbuild/build4mac_env.py index c1084a66b..3be1c22de 100755 --- a/macbuild/build4mac_env.py +++ b/macbuild/build4mac_env.py @@ -192,7 +192,7 @@ RubySequoia = { 'exe': '/System/Library/Frameworks/Ruby.framework/Versions # install with 'sudo port install ruby33' # [Key Type Name] = 'MP33' Ruby33MacPorts = { 'exe': '/opt/local/bin/ruby3.3', - 'inc': '/opt/local/include/ruby-3.3.6', + 'inc': '/opt/local/include/ruby-3.3.7', 'lib': '/opt/local/lib/libruby.3.3.dylib' } From 60f7c70f11c3a1204aa16c778538168632b1eeb2 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Thu, 13 Mar 2025 23:35:58 +0100 Subject: [PATCH 2/4] Trying to fix github workflow --- .github/workflows/build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9b7295218..354450062 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -97,7 +97,7 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: artifact-${{ matrix.os }}-${{ matrix.cibw_arch }}-${{ strategy.job-index }} + name: artifact-sdist path: dist/*.tar.gz upload_to_test_pypy: @@ -106,7 +106,6 @@ jobs: steps: - uses: actions/download-artifact@v4 with: - name: artifact-${{ matrix.os }}-${{ matrix.cibw_arch }}-${{ strategy.job-index }} path: dist - uses: pypa/gh-action-pypi-publish@v1.12.4 @@ -123,7 +122,6 @@ jobs: steps: - uses: actions/download-artifact@v4 with: - name: artifact-${{ matrix.os }}-${{ matrix.cibw_arch }}-${{ strategy.job-index }} path: dist - uses: pypa/gh-action-pypi-publish@v1.12.4 From ed809952c3329944d82e0e8aa4abbf249c1b664d Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Fri, 14 Mar 2025 01:12:13 +0100 Subject: [PATCH 3/4] Pinning setuptools to <76.0.0 for now as this version is broken for MSVC --- azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ad83bd740..8d1ab246a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -92,7 +92,8 @@ jobs: displayName: 'Download and Extract KLayout bits' - script: | - python -m pip install --upgrade pip setuptools wheel + # setuptools 67.0.0 is not working as of now (pypa/setuptools#4885) + python -m pip install --upgrade pip "setuptools<76.0.0" wheel displayName: 'Update pip, setuptools and wheel' - script: | From 82d2adeb0560108cbd861847556a110901d9f68d Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Fri, 14 Mar 2025 01:29:49 +0100 Subject: [PATCH 4/4] Maybe fixing Github action --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 354450062..f87194b2c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -106,6 +106,7 @@ jobs: steps: - uses: actions/download-artifact@v4 with: + merge-multiple: true path: dist - uses: pypa/gh-action-pypi-publish@v1.12.4 @@ -122,6 +123,7 @@ jobs: steps: - uses: actions/download-artifact@v4 with: + merge-multiple: true path: dist - uses: pypa/gh-action-pypi-publish@v1.12.4