Skip to content

Commit 2e8e22a

Browse files
authored
Merge Staging to Dev Workflow (#204)
* Update Dev Package Version (#201) * enable workflow * bump version for next staging run * Update README.md (#203)
1 parent 8f13aef commit 2e8e22a

File tree

2 files changed

+33
-6
lines changed

2 files changed

+33
-6
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# This workflow will merge staging to dev, on auto-bump completed, in order
2+
# to apply auto bumped package version on staging to dev
3+
4+
name: Merge Staging to Dev
5+
6+
on:
7+
workflow_run:
8+
workflows: ["Build and Publish to TestPyPI"]
9+
types:
10+
- completed
11+
branches: [staging]
12+
13+
jobs:
14+
on-success:
15+
name: Merge Staging to Dev
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v3
20+
- name: Merge Staging to Dev
21+
uses: devmasx/merge-branch@master
22+
with:
23+
type: now
24+
from_branch: staging
25+
target_branch: dev
26+
github_token: ${{ secrets.ACTIONS_BOT_TOKEN }}
27+
message: "apply auto bumped package version"

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ edgepi_adc.stop_conversions(ADCNum.ADC_1)
4343
For further details on this and other modules, please refer to each module's documentation by following the links provided in the `Implemented Modules` section below.
4444
# Implemented Modules
4545
The EdgePi SDK contains modules intended to represent each connected peripheral device onboard the EdgePi. Below is a directory of the currently available modules.
46-
* [Thermocouple](src/edgepi/tc)
47-
* [Digital to Analog Converter (DAC)](src/edgepi/dac)
48-
* [Analog to Digital Converter (ADC)](src/edgepi/adc)
49-
* [LED Array](src/edgepi/led)
50-
* [Digital Input (DIN)](src/edgepi/digital_input)
51-
* [Digital Output (DOUT)](src/edgepi/digital_output)
46+
* [Thermocouple](https://github.com/EdgePi-Cloud/edgepi-python-sdk/tree/main/src/edgepi/tc)
47+
* [Digital to Analog Converter (DAC)](https://github.com/EdgePi-Cloud/edgepi-python-sdk/tree/main/src/edgepi/dac)
48+
* [Analog to Digital Converter (ADC)](https://github.com/EdgePi-Cloud/edgepi-python-sdk/tree/main/src/edgepi/adc)
49+
* [LED Array](https://github.com/EdgePi-Cloud/edgepi-python-sdk/tree/main/src/edgepi/led)
50+
* [Digital Input (DIN)](https://github.com/EdgePi-Cloud/edgepi-python-sdk/tree/main/src/edgepi/digital_input)
51+
* [Digital Output (DOUT)](https://github.com/EdgePi-Cloud/edgepi-python-sdk/tree/main/src/edgepi/digital_output)
5252
# Development
5353
Active development SDK versions can be accessed from the following resources:
5454
## Installing from TestPyPi

0 commit comments

Comments
 (0)