From 29976919e0598851c794282fb257d528077d0878 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/stale_issues.yml | 8 ++ .github/workflows/synch_upstream.yml | 107 +++++++++++++++++++++++++++ README.md | 8 +- 3 files changed, 117 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/stale_issues.yml create mode 100644 .github/workflows/synch_upstream.yml diff --git a/.github/workflows/stale_issues.yml b/.github/workflows/stale_issues.yml new file mode 100644 index 0000000000000..82f817a494969 --- /dev/null +++ b/.github/workflows/stale_issues.yml @@ -0,0 +1,8 @@ +name: 'Close stale issues/PRs' +on: + schedule: + - cron: "50 14 */2 * *" + +jobs: + call-workflow: + uses: Infineon/workflows/.github/workflows/epe_stale_issues.yml@master \ No newline at end of file diff --git a/.github/workflows/synch_upstream.yml b/.github/workflows/synch_upstream.yml new file mode 100644 index 0000000000000..4e05230829893 --- /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@v4 + with: + ref: master + token: ${{ secrets.GH_ACT_SYNCH_UPSTREAM }} + + - name: Sync upstream changes + id: sync + uses: aormsby/Fork-Sync-With-Upstream-action@v3.4.1 + 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 c76f92c162234..2f1e385c3ba8d 100644 --- a/README.md +++ b/README.md @@ -35,8 +35,8 @@ DAC, PWM, SPI, I2C, CAN, Bluetooth, and USB. Getting started --------------- -See the [online documentation](https://docs.micropython.org/) for the API -reference and information about using MicroPython and information about how +See the [online documentation (Infineon PSoC6 port ReadTheDocs fork)](https://ifx-micropython.readthedocs.io/en/latest/psoc6/quickref.html) for API +references and information about using MicroPython and information about how it is implemented. We use [GitHub Discussions](https://github.com/micropython/micropython/discussions) @@ -115,12 +115,8 @@ In addition, the following ports are provided in this repository: - [pic16bit](ports/pic16bit) -- Microchip PIC 16-bit. - [powerpc](ports/powerpc) -- IBM PowerPC (including Microwatt) - [psoc6](ports/psoc6) -- Infineon PSoC6. -<<<<<<< HEAD - [qemu-arm](ports/qemu-arm) -- QEMU-based Arm emulated target (for testing) - [qemu-riscv](ports/qemu-riscv) -- QEMU-based RISC-V emulated target (for testing) -======= - - [qemu-arm](ports/qemu-arm) -- QEMU-based emulated target, for testing) ->>>>>>> 5eb5c974b (README.md: Added PSoC6 port to list.) - [renesas-ra](ports/renesas-ra) -- Renesas RA family. - [rp2](ports/rp2) -- Raspberry Pi RP2040 (including Pico and Pico W). - [samd](ports/samd) -- Microchip (formerly Atmel) SAMD21 and SAMD51.