Skip to content

Commit

Permalink
Merge branch 'tschm-patch-1' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
tschm authored Jan 28, 2025
2 parents 035cb8c + 21a83f7 commit 2b91591
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 47 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "ci"
name: "CI"

on:
- push
Expand Down
38 changes: 13 additions & 25 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,26 @@
name: Upload Python Package
name: Bump version and publish

on:
release:
types: [published]
workflow_run:
workflows: [ "CI" ]
types: [ completed ]

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout [${{ github.repository }}]
uses: actions/checkout@v4
tag:
permissions:
contents: write

- uses: cvxgrp/.github/actions/uv/[email protected]
if: >
github.event.workflow_run.conclusion == 'success' &&
github.event.workflow_run.head_branch == 'main'
deploy:
runs-on: ubuntu-latest
needs: build
environment: release

permissions:
# This permission is required for trusted publishing.
id-token: write

steps:
- name: Checkout [${{ github.repository }}]
uses: actions/checkout@v4

# download dist from build
- uses: actions/download-artifact@v4
with:
name: dist
path: dist

- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
- name: Generate Tag
uses: cvxgrp/.github/actions/uv/[email protected]
with:
repository-url: https://upload.pypi.org/legacy/
github_token: ${{ secrets.GITHUB_TOKEN }}
8 changes: 0 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,6 @@ repos:
- id: check-github-workflows
args: ["--verbose"]

- repo: https://github.com/Lucas-C/pre-commit-hooks
rev: v1.5.5
hooks:
- id: insert-license
files: ^(cvx)
args:
['--license-filepath', 'copyright.txt', '--no-extra-eol']

- repo: https://github.com/rhysd/actionlint
rev: v1.7.7
hooks:
Expand Down
13 changes: 0 additions & 13 deletions copyright.txt

This file was deleted.

0 comments on commit 2b91591

Please sign in to comment.