Skip to content

Commit a22d03f

Browse files
committed
Merge branch 'change/maintanence' into 'master'
change: Add several unrelated maintenance updates to the repository See merge request espressif/esp-idf-monitor!109
2 parents 83ac178 + 027616c commit a22d03f

File tree

12 files changed

+109
-120
lines changed

12 files changed

+109
-120
lines changed

.github/workflows/dangerjs.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
name: DangerJS Check
1+
name: DangerJS Pull Request linter
22
on:
33
pull_request_target:
44
types: [opened, edited, reopened, synchronize]
55

66
permissions:
77
pull-requests: write
8-
contents: write
8+
contents: read
99

1010
jobs:
1111
pull-request-style-linter:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- name: Check out PR head
15-
uses: actions/checkout@v3
16-
with:
17-
ref: ${{ github.event.pull_request.head.sha }}
14+
- name: Check out PR head
15+
uses: actions/checkout@v4
16+
with:
17+
ref: ${{ github.event.pull_request.head.sha }}
1818

19-
- name: DangerJS pull request linter
20-
uses: espressif/github-actions/danger_pr_review@master
21-
env:
22-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
19+
- name: DangerJS pull request linter
20+
uses: espressif/shared-github-dangerjs@v1
21+
env:
22+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/issue_comment.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/new_issues.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/new_prs.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/workflows/realease_pypi.yml

Lines changed: 0 additions & 38 deletions
This file was deleted.

.github/workflows/release_pypi.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: PyPI release
2+
3+
on:
4+
release:
5+
types: [released]
6+
7+
permissions:
8+
id-token: write
9+
contents: read
10+
11+
jobs:
12+
build_and_upload:
13+
runs-on: ubuntu-latest
14+
environment: pypi
15+
steps:
16+
- uses: actions/checkout@v4
17+
18+
- name: Set up Python 3.14
19+
uses: actions/setup-python@v6
20+
with:
21+
python-version: '3.14'
22+
23+
- name: Install dependencies
24+
run: |
25+
python -m pip install --upgrade pip build
26+
pip install .
27+
28+
- name: Build package
29+
run: python -m build
30+
31+
- name: Publish to PyPI
32+
uses: pypa/gh-action-pypi-publish@release/v1
33+
with:
34+
skip-existing: true

.github/workflows/sync-jira.yml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# This workflow synchronizes GitHub issues, comments, and pull requests with Jira.
2+
# Triggers: new issues, issue comments, hourly schedule, and manual dispatch.
3+
# Uses espressif/sync-jira-actions (see https://github.com/espressif/sync-jira-actions).
4+
5+
name: Sync to Jira
6+
7+
run-name: >
8+
Sync to Jira -
9+
${{ github.event_name == 'issue_comment' && 'Issue Comment' ||
10+
github.event_name == 'schedule' && 'New Pull Requests' ||
11+
github.event_name == 'issues' && 'New Issue' ||
12+
github.event_name == 'workflow_dispatch' && 'Manual Sync' }}
13+
14+
on:
15+
issues:
16+
types: [opened]
17+
issue_comment:
18+
types: [created, edited, deleted]
19+
schedule:
20+
- cron: '0 * * * *'
21+
workflow_dispatch:
22+
inputs:
23+
action:
24+
description: 'Action to be performed'
25+
required: true
26+
default: 'mirror-issues'
27+
issue-numbers:
28+
description: 'Issue numbers to sync (comma-separated)'
29+
required: true
30+
31+
jobs:
32+
sync-to-jira:
33+
name: >
34+
Sync to Jira -
35+
${{ github.event_name == 'issue_comment' && 'Issue Comment' ||
36+
github.event_name == 'schedule' && 'New Pull Requests' ||
37+
github.event_name == 'issues' && 'New Issue' ||
38+
github.event_name == 'workflow_dispatch' && 'Manual Sync' }}
39+
runs-on: ubuntu-latest
40+
permissions:
41+
contents: read
42+
issues: write
43+
pull-requests: write
44+
steps:
45+
- name: Check out
46+
uses: actions/checkout@v4
47+
48+
- name: Run synchronization to Jira
49+
uses: espressif/sync-jira-actions@v1
50+
with:
51+
cron_job: ${{ github.event_name == 'schedule' && 'true' || '' }}
52+
env:
53+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
54+
JIRA_PASS: ${{ secrets.JIRA_PASS }}
55+
JIRA_PROJECT: IDFGH
56+
JIRA_COMPONENT: idf_monitor
57+
JIRA_URL: ${{ secrets.JIRA_URL }}
58+
JIRA_USER: ${{ secrets.JIRA_USER }}

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,8 @@ test/test_apps/pytest_embedded_log/
2020

2121
esp_idf_monitor.egg-info
2222
.eggs
23+
dist/
24+
build/
25+
.ruff_cache/
2326

2427
__pycache__

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ repos:
2323
exclude: ^test/host_test/inputs
2424

2525
- repo: https://github.com/astral-sh/ruff-pre-commit
26-
rev: v0.14.10
26+
rev: v0.15.1
2727
hooks:
2828
- id: ruff
2929
args: [--fix, --exit-non-zero-on-fix]

esp_idf_monitor/base/binlog.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -404,9 +404,7 @@ def convert_specifier(self, specifier: str) -> str:
404404
return 'x' if specifier == 'x' else 'X'
405405
elif specifier in 'fFeEgGaA':
406406
return specifier
407-
elif specifier == 'c': # Characters treated as string
408-
return 's'
409-
elif specifier in 'sS':
407+
elif specifier == 'c' or specifier in 'sS': # Characters treated as string
410408
return 's'
411409
elif specifier == 'p':
412410
return '#x'

0 commit comments

Comments
 (0)