Skip to content

Commit 8f31468

Browse files
committed
Merge branch 'release/1.3.5'
2 parents af9eb32 + e11ef0f commit 8f31468

2 files changed

Lines changed: 20 additions & 8 deletions

File tree

.github/workflows/test_and_publish.yml

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,16 @@ jobs:
5555
build-wheels:
5656
name: Build wheels
5757
runs-on: ${{ matrix.os }}
58-
needs: is-duplicate
58+
needs: test-code
5959
if: |
60-
needs.is-duplicate.outputs.should_skip != 'true' &&
61-
startsWith(github.ref, 'refs/heads/develop')
60+
!failure() &&
61+
(
62+
startsWith(github.ref, 'refs/heads/develop') ||
63+
(
64+
github.event_name == 'push' &&
65+
startsWith(github.ref, 'refs/tags/v')
66+
)
67+
)
6268
strategy:
6369
matrix:
6470
os: [ubuntu-latest, macos-latest, windows-latest]
@@ -81,10 +87,16 @@ jobs:
8187
build-sdist:
8288
name: Build source distribution
8389
runs-on: ubuntu-latest
84-
needs: is-duplicate
90+
needs: test-code
8591
if: |
86-
needs.is-duplicate.outputs.should_skip != 'true' &&
87-
startsWith(github.ref, 'refs/heads/develop')
92+
!failure() &&
93+
(
94+
startsWith(github.ref, 'refs/heads/develop') ||
95+
(
96+
github.event_name == 'push' &&
97+
startsWith(github.ref, 'refs/tags/v')
98+
)
99+
)
88100
89101
steps:
90102
- name: Check out code
@@ -107,7 +119,7 @@ jobs:
107119
name: Publish to TestPyPI
108120
environment: staging
109121
runs-on: ubuntu-latest
110-
needs: [test-code, build-sdist, build-wheels]
122+
needs: [build-sdist, build-wheels]
111123
if: |
112124
!failure() &&
113125
github.event_name == 'push' &&

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[metadata]
22
name = python4yahdlc
3-
version = 1.3.4
3+
version = 1.3.5
44
description = Python binding of the yahdlc library allowing to encode and decode HDLC frames.
55
long_description = file: README.rst
66
long_description_content_type = text/x-rst

0 commit comments

Comments
 (0)