Skip to content

Commit

Permalink
Merge branch 'oss-main' into kv-pair-handler
Browse files Browse the repository at this point in the history
  • Loading branch information
LinZhihao-723 committed Feb 8, 2025
2 parents 1bcf7d7 + 53242ec commit 2f03629
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 18 deletions.
36 changes: 32 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,37 @@
# References
<!-- Any issues or pull requests relevant to this pull request -->
<!-- markdownlint-disable MD012 -->

<!--
Set the PR title to a meaningful commit message that:
* is in imperative form.
* follows the Conventional Commits specification (https://www.conventionalcommits.org).
* See https://github.com/commitizen/conventional-commit-types/blob/master/index.json for possible
types.
Example:
fix: Don't add implicit wildcards ('*') at the beginning and the end of a query (fixes #390).
-->

# Description
<!-- Describe what this request will change/fix and provide any details necessary for reviewers -->

<!-- Describe what this request will change/fix and provide any details necessary for reviewers. -->



# Checklist

<!-- Ensure each item below is satisfied and indicate so by inserting an `x` within each `[ ]`. -->

* [ ] The PR satisfies the [contribution guidelines][yscope-contrib-guidelines].
* [ ] This is a breaking change and that has been indicated in the PR title, OR this isn't a
breaking change.
* [ ] Necessary docs have been updated, OR no docs need to be updated.

# Validation performed
<!-- What tests and validation you performed on the change -->

<!-- Describe what tests and validation you performed on the change. -->



[yscope-contrib-guidelines]: https://docs.yscope.com/dev-guide/contrib-guides-overview.html
20 changes: 10 additions & 10 deletions .github/workflows/package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
matrix:
python-version: ["3.8", "3.11"]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -32,7 +32,7 @@ jobs:

- run: python -m build

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: wheel-${{ matrix.python-version }}
path: dist/*
Expand All @@ -42,18 +42,18 @@ jobs:
needs: [build]
strategy:
matrix:
os: [macos-13, ubuntu-latest]
os: [macos-13, ubuntu-22.04]
python-version: ["3.7"]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Download wheels for Python3.7
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
# Since we don't build for Python 3.7, we download the Python 3.8 wheel instead.
name: wheel-3.8
Expand All @@ -74,14 +74,14 @@ jobs:
python-version: ["3.8", "3.11"]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Download wheels for Built Python Versions
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: wheel-${{ matrix.python-version }}
path: dist/
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/pr-title-checks.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: "pr-title-checks"

on:
pull_request_target:
# NOTE: Workflows triggered by this event give the workflow access to secrets and grant the
# `GITHUB_TOKEN` read/write repository access by default. So we need to ensure:
# - This workflow doesn't inadvertently check out, build, or execute untrusted code from the
# pull request triggered by this event.
# - Each job has `permissions` set to only those necessary.
types: ["edited", "opened", "reopened"]
branches: ["main"]

permissions: {}

concurrency:
group: "${{github.workflow}}-${{github.ref}}"

# Cancel in-progress jobs for efficiency
cancel-in-progress: true

jobs:
conventional-commits:
permissions:
# For amannn/action-semantic-pull-request
pull-requests: "read"
runs-on: "ubuntu-latest"
steps:
- uses: "amannn/action-semantic-pull-request@v5"
env:
GITHUB_TOKEN: "${{secrets.GITHUB_TOKEN}}"
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:
permissions:
id-token: write
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: "3.8"

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: wheel-3.8
path: dist/
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "clp_logging"
version = "0.0.12"
version = "0.0.13"
license = { text = "Apache License 2.0" }
authors = [
{ name="david lion", email="david.lion@yscope.com" },
Expand Down

0 comments on commit 2f03629

Please sign in to comment.