From c19efbd3b432a8b66b5a0e80791d2a5d6ce16071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bern=C3=A1t=20G=C3=A1bor?= Date: Wed, 16 Oct 2024 21:39:34 -0700 Subject: [PATCH] Fix GitHub action warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Bernát Gábor --- .github/workflows/pyproject_fmt_build.yaml | 42 ++++++++++++---------- .gitignore | 1 + .pre-commit-config.yaml | 6 ++++ tasks/changelog.py | 5 +-- 4 files changed, 33 insertions(+), 21 deletions(-) diff --git a/.github/workflows/pyproject_fmt_build.yaml b/.github/workflows/pyproject_fmt_build.yaml index 2a8f659..357cafa 100644 --- a/.github/workflows/pyproject_fmt_build.yaml +++ b/.github/workflows/pyproject_fmt_build.yaml @@ -41,9 +41,7 @@ jobs: crate: cargo-edit - uses: actions/checkout@v4 - name: Bump version - run: - cargo set-version -p pyproject-fmt --bump '${{ github.event.inputs.release == 'no' || - github.event.inputs.release == null && 'patch' || github.event.inputs.release }}' + run: cargo set-version -p pyproject-fmt --bump '${{ github.event.inputs.release == 'no' || github.event.inputs.release == null && 'patch' || github.event.inputs.release }}' - name: Install the latest version of uv uses: astral-sh/setup-uv@v3 with: @@ -51,12 +49,12 @@ jobs: cache-dependency-glob: "tasks/changelog.py" - name: Generate changelog id: get-version - run: - uv run tasks/changelog.py pyproject-fmt "${{ github.event.number }}" "${{ github.event.pull_request.base.sha - }}" + run: uv run tasks/changelog.py pyproject-fmt "${{ github.event.number }}" "${{ github.event.pull_request.base.sha }}" env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - uses: actions/setup-python@v5 + with: + python-version: "3.12" - uses: pre-commit/action@v3.0.1 continue-on-error: true - name: Show changes to the repository @@ -106,9 +104,7 @@ jobs: with: target: ${{ matrix.platform.target }} - args: - -m pyproject-fmt/Cargo.toml --release --out dist --interpreter ${{ matrix.platform.interpreter || '3.8' }} - --target-dir target + args: -m pyproject-fmt/Cargo.toml --release --out dist --interpreter ${{ matrix.platform.interpreter || '3.8' }} --target-dir target sccache: "true" manylinux: ${{ matrix.platform.manylinux || 'auto' }} - name: Upload wheels @@ -137,9 +133,7 @@ jobs: with: target: ${{ matrix.platform.target }} - args: - -m pyproject-fmt/Cargo.toml --release --out dist --interpreter ${{ matrix.platform.interpreter || '3.8' }} - --target-dir target + args: -m pyproject-fmt/Cargo.toml --release --out dist --interpreter ${{ matrix.platform.interpreter || '3.8' }} --target-dir target sccache: "true" - name: Upload wheels uses: actions/upload-artifact@v4 @@ -167,9 +161,7 @@ jobs: with: target: ${{ matrix.platform.target }} - args: - -m pyproject-fmt/Cargo.toml --release --out dist --interpreter "3.8 pypy3.8 pypy3.9 pypy3.10" --target-dir - target + args: -m pyproject-fmt/Cargo.toml --release --out dist --interpreter "3.8 pypy3.8 pypy3.9 pypy3.10" --target-dir target sccache: "true" - name: Upload wheels uses: actions/upload-artifact@v4 @@ -206,11 +198,15 @@ jobs: permissions: id-token: write contents: write - if: github.event.inputs.release != 'no' && github.event.inputs.release != null && github.ref == 'main' - needs: [linux, windows, macos, sdist, bump] + if: github.event.inputs.release != 'no' && github.event.inputs.release != null && github.ref == 'refs/heads/main' + needs: [bump, sdist, linux, macos, windows] steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v4 + - name: Download source + uses: actions/download-artifact@v4 + with: + name: source + path: . - name: Show changes to the repository run: git diff HEAD -u - name: Commit changes @@ -220,11 +216,19 @@ jobs: git commit -am "Release pyproject-fmt ${{needs.bump.outputs.version}}" - name: Tag release run: git tag pyproject-fmt/${{needs.bump.outputs.version}} + - name: Download wheels + uses: actions/download-artifact@v4 + with: + pattern: wheels-* + path: dist + merge-multiple: "true" + - name: Show wheels + run: ls -lath dist && exit 1 - name: Publish to PyPI uses: PyO3/maturin-action@e21013af641daf9513198d98a6853760803a5c6c with: command: upload - args: --non-interactive --skip-existing wheels-*/* + args: --non-interactive --skip-existing dist/* - name: Push release commit+tag and create GitHub release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index 7c5c88c..7aadb5b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /target /pyproject-fmt/.tox /pyproject-fmt/dist +/dist diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2e7c0eb..b686b94 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -29,7 +29,13 @@ repos: rev: "v3.3.3" hooks: - id: prettier + name: Prettier non-workflow files args: ["--print-width=120", "--prose-wrap=always"] + exclude: ".github/workflows/" + - id: prettier + name: Prettier workflow files + args: ["--print-width=240", "--prose-wrap=always"] + exclude: "^(?!.github/workflows/)" - repo: meta hooks: - id: check-hooks-apply diff --git a/tasks/changelog.py b/tasks/changelog.py index a96bd60..59ab4c0 100644 --- a/tasks/changelog.py +++ b/tasks/changelog.py @@ -35,7 +35,7 @@ class Options(Namespace): def run() -> None: options = parse_cli() - print(options) + print(f">> {options}") project = ROOT / options.project changelog_file = project / "CHANGELOG.md" @@ -67,7 +67,8 @@ def run() -> None: else: new = "" - if output := os.environ.get("GITHUB_TOKEN"): + if output := os.environ.get("GITHUB_OUTPUT"): + print(f">> GitHub output set, populating: {output}") with Path(output).open("at+", encoding="utf-8") as file_handler: file_handler.write(f"version={version}\n") file_handler.write(f"changelog<