From 5210207b8bd99eda84b7bd70fd6c04299904b096 Mon Sep 17 00:00:00 2001 From: Mike Popoloski Date: Fri, 17 Jan 2025 21:10:04 -0500 Subject: [PATCH] Update workflows after pyslang merge --- .github/workflows/build.yml | 14 -------------- .github/workflows/python-build.yml | 2 -- .github/workflows/python-dist.yml | 12 +++++++----- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7fee41af1..99f29af11 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -83,20 +83,6 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} verbose: true - bindings: - runs-on: windows-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - uses: ilammy/msvc-dev-cmd@v1 - - name: Configure - run: cmake -B build -DSLANG_INCLUDE_PYLIB=ON - - name: Build - run: cmake --build build --config Release -j8 - - name: Run tests - run: ctest --test-dir build --output-on-failure -C Release --no-tests=error -j8 - conan: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/python-build.yml b/.github/workflows/python-build.yml index d91cf9398..07bd3673e 100644 --- a/.github/workflows/python-build.yml +++ b/.github/workflows/python-build.yml @@ -1,7 +1,6 @@ name: "Python Build" on: - workflow_dispatch: pull_request: push: branches: @@ -20,7 +19,6 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - submodules: recursive - uses: maxim-lobanov/setup-xcode@v1 if: matrix.platform == 'macos-latest' with: diff --git a/.github/workflows/python-dist.yml b/.github/workflows/python-dist.yml index 99c257b43..9e03c954a 100644 --- a/.github/workflows/python-dist.yml +++ b/.github/workflows/python-dist.yml @@ -16,7 +16,6 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - submodules: recursive - name: Build SDist run: pipx run build --sdist - name: Check metadata @@ -37,12 +36,11 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - submodules: recursive - uses: maxim-lobanov/setup-xcode@v1 if: matrix.os == 'macos-latest' with: xcode-version: 'latest' - - uses: pypa/cibuildwheel@v2.21.3 + - uses: pypa/cibuildwheel@v2.22.0 env: CIBW_ARCHS_MACOS: auto universal2 MACOSX_DEPLOYMENT_TARGET: "10.15" @@ -58,6 +56,9 @@ jobs: name: Upload test needs: [build_wheels, build_sdist] runs-on: ubuntu-latest + environment: pypi-test + permissions: + id-token: write if: startsWith(github.ref, 'refs/tags') steps: - uses: actions/setup-python@v5 @@ -70,7 +71,6 @@ jobs: merge-multiple: true - uses: pypa/gh-action-pypi-publish@release/v1 with: - password: ${{ secrets.TEST_PYPI_API_TOKEN }} repository-url: https://test.pypi.org/legacy/ verbose: true skip_existing: true @@ -79,6 +79,9 @@ jobs: name: Upload official needs: [build_wheels, build_sdist] runs-on: ubuntu-latest + environment: pypi + permissions: + id-token: write if: (github.event_name == 'release' && github.event.action == 'published') || github.event_name == 'workflow_dispatch' steps: - uses: actions/setup-python@v5 @@ -91,5 +94,4 @@ jobs: merge-multiple: true - uses: pypa/gh-action-pypi-publish@release/v1 with: - password: ${{ secrets.PYPI_API_TOKEN }} verbose: true