From cecedc65011329b6b500553dcad1e70fa06a3454 Mon Sep 17 00:00:00 2001 From: jaenrig-ifx Date: Tue, 25 Apr 2023 16:22:23 +0200 Subject: [PATCH] ports/psoc6: PSoC6 Infineon fork patch. Signed-off-by: jaenrig-ifx --- .github/workflows/synch_upstream.yml | 107 +++++++++++++++++++++++++++ README.md | 2 +- 2 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/synch_upstream.yml diff --git a/.github/workflows/synch_upstream.yml b/.github/workflows/synch_upstream.yml new file mode 100644 index 0000000000000..5b75df46308cc --- /dev/null +++ b/.github/workflows/synch_upstream.yml @@ -0,0 +1,107 @@ +name: Sync Upstream + +on: + schedule: + - cron: '0 0 */1 * *' # daily 00:00 + workflow_dispatch: # on button click + +jobs: + synch_master: + runs-on: ubuntu-latest + + steps: + - name: Checkout target repo + uses: actions/checkout@v3 + with: + ref: master + token: ${{ secrets.GH_ACT_SYNCH_UPSTREAM }} + + - name: Sync upstream changes + id: sync + uses: aormsby/Fork-Sync-With-Upstream-action@v3.4 + with: + target_sync_branch: master + target_repo_token: ${{ secrets.GH_ACT_SYNCH_UPSTREAM }} + upstream_sync_branch: master + upstream_sync_repo: micropython/micropython + git_config_pull_rebase: true + + + - name: New commits found + if: steps.sync.outputs.has_new_commits == 'true' + run: echo "New commits were found to sync." + + - name: No new commits + if: steps.sync.outputs.has_new_commits == 'false' + run: echo "There were no new commits." + + - name: Show value of 'has_new_commits' + run: echo ${{ steps.sync.outputs.has_new_commits }} + + synch_port_psoc6: + runs-on: ubuntu-latest + needs: synch_master + + steps: + - name: Checkout target repo + uses: actions/checkout@v3 + with: + ref: ports-psoc6-main + token: ${{ secrets.GH_ACT_SYNCH_UPSTREAM }} + + - name: Sync upstream changes + id: sync + uses: aormsby/Fork-Sync-With-Upstream-action@v3.4 + with: + target_sync_branch: ports-psoc6-main + target_repo_token: ${{ secrets.GH_ACT_SYNCH_UPSTREAM }} + upstream_sync_branch: master + upstream_sync_repo: micropython/micropython + git_config_pull_rebase: true + target_branch_push_args: '--force' + + - name: New commits found + if: steps.sync.outputs.has_new_commits == 'true' + run: echo "New commits were found to sync." + + - name: No new commits + if: steps.sync.outputs.has_new_commits == 'false' + run: echo "There were no new commits." + + - name: Show value of 'has_new_commits' + run: echo ${{ steps.sync.outputs.has_new_commits }} + + + synch_port_psoc6_ifx: + runs-on: ubuntu-latest + needs: synch_port_psoc6 + + steps: + - name: Checkout target repo + uses: actions/checkout@v3 + with: + ref: ports-psoc6-ifx + token: ${{ secrets.GH_ACT_SYNCH_UPSTREAM }} + + - name: Sync upstream changes + id: sync + uses: aormsby/Fork-Sync-With-Upstream-action@v3.4 + with: + target_sync_branch: ports-psoc6-ifx + target_repo_token: ${{ secrets.GH_ACT_SYNCH_UPSTREAM }} + upstream_sync_branch: ports-psoc6-main + upstream_sync_repo: infineon/micropython + git_config_pull_rebase: true + target_branch_push_args: '--force' + + + - name: New commits found + if: steps.sync.outputs.has_new_commits == 'true' + run: echo "New commits were found to sync." + + - name: No new commits + if: steps.sync.outputs.has_new_commits == 'false' + run: echo "There were no new commits." + + - name: Show value of 'has_new_commits' + run: echo ${{ steps.sync.outputs.has_new_commits }} \ No newline at end of file diff --git a/README.md b/README.md index 77130e2ddb121..1c660bfeb4a7c 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ DAC, PWM, SPI, I2C, CAN, Bluetooth, and USB. Getting started --------------- -See the [online documentation](https://docs.micropython.org/) for API +See the [online documentation (Infineon ReadTheDocs fork)](https://ifx-micropython.readthedocs.io/) for API references and information about using MicroPython and information about how it is implemented.