From fa7cf883bafc3ac60c1a493ba457c492523b1396 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Thu, 25 May 2023 09:47:45 -0400 Subject: [PATCH 01/28] Fix typo in README --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index e05bae8..855537d 100644 --- a/README.rst +++ b/README.rst @@ -9,7 +9,7 @@ workflows-circuitpython-libs ============================ -A collection of CI workflowss for CircuitPython libraries +A collection of CI workflows for CircuitPython libraries Instructions ------------ From dc54561ba2e921bf409fcd1352708ef5854ab5d4 Mon Sep 17 00:00:00 2001 From: Tekktrik Date: Mon, 29 May 2023 15:50:03 -0400 Subject: [PATCH 02/28] Stremaline pip install commands --- build/action.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/build/action.yml b/build/action.yml index 063c25f..f987eab 100644 --- a/build/action.yml +++ b/build/action.yml @@ -59,16 +59,11 @@ runs: - name: Install pytest shell: bash run: pip install pytest - - name: Install dependencies - shell: bash - run: | - pip install -r requirements.txt - pip install -r optional_requirements.txt - name: Run pytest shell: bash run: | if [[ -d tests ]]; then - pip install . + pip install ".[optional]" pytest fi - name: Build assets From 170bd077a035ddc2db6f5bde3f6607fa1befa68b Mon Sep 17 00:00:00 2001 From: Tekktrik Date: Mon, 29 May 2023 15:53:16 -0400 Subject: [PATCH 03/28] Add step for checking packaging info --- build/action.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/action.yml b/build/action.yml index f987eab..5dae8a6 100644 --- a/build/action.yml +++ b/build/action.yml @@ -89,6 +89,10 @@ runs: shell: bash run: | echo pyproject-toml=$( find . -wholename './pyproject.toml' ) >> $GITHUB_OUTPUT + - name: Check packaging information + if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml') + shell: bash + run: python actions-ci/check_lib_packaging.py - name: Build Python package if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml') shell: bash From 1934d995389ea9b74969b1085a985c0e78490b7f Mon Sep 17 00:00:00 2001 From: Tekktrik Date: Wed, 31 May 2023 23:27:29 -0400 Subject: [PATCH 04/28] Fix building bundles for build CI --- build/action.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/build/action.yml b/build/action.yml index 063c25f..7495195 100644 --- a/build/action.yml +++ b/build/action.yml @@ -9,6 +9,12 @@ inputs: description: 'The version of Python to use in the CI' required: true default: '3.x' + package-prefix: + description: | + The prefix (or name) of your pacakge (if applicable) to use + for GitHub releases + required: true + default: "" runs: using: "composite" steps: @@ -71,9 +77,18 @@ runs: pip install . pytest fi + - name: Add the given package filename_prefix + id: package-prefix-arg + shell: bash + run: | + if [ "${{ inputs.package-prefix }}" == "" ]; then + echo prefix-arg="" >> $GITHUB_OUTPUT + else + echo prefix-arg="--package_folder_prefix ${{ inputs.package-prefix }}" >> $GITHUB_OUTPUT + fi - name: Build assets shell: bash - run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location . + run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location . ${{ steps.package-prefix-arg.outputs.prefix-arg }} - name: Archive bundles uses: actions/upload-artifact@v3 with: From 03cce16d5a269b3abe871e2fb08360add891fb5d Mon Sep 17 00:00:00 2001 From: Alec Delaney <89490472+tekktrik@users.noreply.github.com> Date: Wed, 7 Jun 2023 11:10:45 -0400 Subject: [PATCH 05/28] Move pytest installation --- build/action.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build/action.yml b/build/action.yml index 5dae8a6..faeab65 100644 --- a/build/action.yml +++ b/build/action.yml @@ -56,13 +56,11 @@ runs: shell: bash run: | pre-commit run --all-files - - name: Install pytest - shell: bash - run: pip install pytest - name: Run pytest shell: bash run: | if [[ -d tests ]]; then + pip install pytest pip install ".[optional]" pytest fi From bf332ac8519e7426ba8bd696593f4ee17299c4d7 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 13 Jun 2023 21:10:02 -0500 Subject: [PATCH 06/28] Invoke circuitpython-build-bundles identically for PRs & releases --- build/action.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/build/action.yml b/build/action.yml index 063c25f..68333ba 100644 --- a/build/action.yml +++ b/build/action.yml @@ -71,9 +71,18 @@ runs: pip install . pytest fi + - name: Add the given package filename_prefix + id: package-prefix-arg + shell: bash + run: | + if [ "${{ inputs.package-prefix }}" == "" ]; then + echo prefix-arg="" >> $GITHUB_OUTPUT + else + echo prefix-arg="--package_folder_prefix ${{ inputs.package-prefix }}" >> $GITHUB_OUTPUT + fi - name: Build assets shell: bash - run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location . + run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location . ${{ steps.package-prefix-arg.outputs.prefix-arg }} - name: Archive bundles uses: actions/upload-artifact@v3 with: From e9a918e851fe76d96039e45ae6212f9af690b6be Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Wed, 14 Jun 2023 07:28:58 -0500 Subject: [PATCH 07/28] actually accept the package-prefix argument --- build/action.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build/action.yml b/build/action.yml index 68333ba..7495195 100644 --- a/build/action.yml +++ b/build/action.yml @@ -9,6 +9,12 @@ inputs: description: 'The version of Python to use in the CI' required: true default: '3.x' + package-prefix: + description: | + The prefix (or name) of your pacakge (if applicable) to use + for GitHub releases + required: true + default: "" runs: using: "composite" steps: From 823e7210e5fdb33747e646312bdfdcfc0b18df20 Mon Sep 17 00:00:00 2001 From: Tekktrik Date: Mon, 10 Jul 2023 22:08:17 -0400 Subject: [PATCH 08/28] Allow bundles to be skipped from being built --- release-gh/action.yml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/release-gh/action.yml b/release-gh/action.yml index 0b45309..cca484d 100644 --- a/release-gh/action.yml +++ b/release-gh/action.yml @@ -21,6 +21,13 @@ inputs: for GitHub releases required: true default: "" + ignore-bundles: + description: | + A comma and space separated list of bundles to be skipped when building. + Valid options are py, mpy, example, and json. For example, to skip + building the MPY and example bundles, this field would be: mpy, example + required: true + default: "" runs: using: "composite" steps: @@ -63,9 +70,23 @@ runs: else echo prefix-arg="--package_folder_prefix ${{ inputs.package-prefix }}" >> $GITHUB_OUTPUT fi + - name: Add the given bundle ignores + id: ignore-bundles-arg + shell: bash + run: | + if [ "${{ inputs.ignore-bundles }}" == "" ]; then + echo ignore-bundles="" >> $GITHUB_OUTPUT + else + echo ignore-bundles='--ignore "${{ inputs.ignore-bundles }}"' >> $GITHUB_OUTPUT + fi - name: Build assets shell: bash - run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location . ${{ steps.package-prefix-arg.outputs.prefix-arg }} + run: | + circuitpython-build-bundles \ + --filename_prefix ${{ steps.repo-name.outputs.repo-name }} \ + --library_location . \ + ${{ steps.package-prefix-arg.outputs.prefix-arg }} \ + ${{ steps.ignore-bundles-arg.outputs.prefix-arg }} - name: Upload Release Assets uses: shogo82148/actions-upload-release-asset@v1 with: From 6e58d88a10fec587ee8367977fbdb7caba939305 Mon Sep 17 00:00:00 2001 From: Tekktrik Date: Tue, 11 Jul 2023 20:55:50 -0400 Subject: [PATCH 09/28] Use script to announce pre-commit hook versions --- build/action.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/action.yml b/build/action.yml index 7495195..03f3ef9 100644 --- a/build/action.yml +++ b/build/action.yml @@ -58,6 +58,10 @@ runs: run: git describe --dirty --always --tags - name: Setup problem matchers uses: adafruit/circuitpython-action-library-ci-problem-matchers@v1 + - name: Print pre-commit hook versions + shell: bash + run: | + python actions-ci/print_precommit_versions.py - name: Pre-commit hooks shell: bash run: | From 54fed6c928893d2f998a3af907a56ca9223869fc Mon Sep 17 00:00:00 2001 From: Tekktrik Date: Fri, 14 Jul 2023 16:12:54 -0400 Subject: [PATCH 10/28] Remove duplicate pip install --- build/action.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build/action.yml b/build/action.yml index 7495195..baa1365 100644 --- a/build/action.yml +++ b/build/action.yml @@ -65,11 +65,6 @@ runs: - name: Install pytest shell: bash run: pip install pytest - - name: Install dependencies - shell: bash - run: | - pip install -r requirements.txt - pip install -r optional_requirements.txt - name: Run pytest shell: bash run: | From 271a32194028424390eee67e125779686e0a62b9 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Thu, 25 May 2023 09:47:45 -0400 Subject: [PATCH 11/28] Fix typo in README --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index e05bae8..855537d 100644 --- a/README.rst +++ b/README.rst @@ -9,7 +9,7 @@ workflows-circuitpython-libs ============================ -A collection of CI workflowss for CircuitPython libraries +A collection of CI workflows for CircuitPython libraries Instructions ------------ From 76282586926e37798a51139dc1d98e65015c834a Mon Sep 17 00:00:00 2001 From: Tekktrik Date: Wed, 31 May 2023 23:27:29 -0400 Subject: [PATCH 12/28] Fix building bundles for build CI --- build/action.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/build/action.yml b/build/action.yml index faeab65..2f62286 100644 --- a/build/action.yml +++ b/build/action.yml @@ -9,6 +9,12 @@ inputs: description: 'The version of Python to use in the CI' required: true default: '3.x' + package-prefix: + description: | + The prefix (or name) of your pacakge (if applicable) to use + for GitHub releases + required: true + default: "" runs: using: "composite" steps: @@ -64,9 +70,18 @@ runs: pip install ".[optional]" pytest fi + - name: Add the given package filename_prefix + id: package-prefix-arg + shell: bash + run: | + if [ "${{ inputs.package-prefix }}" == "" ]; then + echo prefix-arg="" >> $GITHUB_OUTPUT + else + echo prefix-arg="--package_folder_prefix ${{ inputs.package-prefix }}" >> $GITHUB_OUTPUT + fi - name: Build assets shell: bash - run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location . + run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location . ${{ steps.package-prefix-arg.outputs.prefix-arg }} - name: Archive bundles uses: actions/upload-artifact@v3 with: From 5b2c94115e8f3390951684ec799a00d37f1a3824 Mon Sep 17 00:00:00 2001 From: Tekktrik Date: Mon, 29 May 2023 15:50:03 -0400 Subject: [PATCH 13/28] Stremaline pip install commands --- build/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/build/action.yml b/build/action.yml index 2f62286..6e2d3b5 100644 --- a/build/action.yml +++ b/build/action.yml @@ -67,7 +67,6 @@ runs: run: | if [[ -d tests ]]; then pip install pytest - pip install ".[optional]" pytest fi - name: Add the given package filename_prefix From 54f163a315137d23b222ec4a67868816e0931038 Mon Sep 17 00:00:00 2001 From: Alec Delaney <89490472+tekktrik@users.noreply.github.com> Date: Sat, 5 Aug 2023 17:31:32 -0400 Subject: [PATCH 14/28] Use pytest with library in path --- build/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/action.yml b/build/action.yml index 6e2d3b5..e8b6e4a 100644 --- a/build/action.yml +++ b/build/action.yml @@ -67,7 +67,7 @@ runs: run: | if [[ -d tests ]]; then pip install pytest - pytest + pyrhon -m pytest fi - name: Add the given package filename_prefix id: package-prefix-arg From eaebcdeed36d4dcc0617c3298afcbd3a08e3cd70 Mon Sep 17 00:00:00 2001 From: Alec Delaney <89490472+tekktrik@users.noreply.github.com> Date: Sat, 5 Aug 2023 20:01:52 -0400 Subject: [PATCH 15/28] Correct typo --- build/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/action.yml b/build/action.yml index e8b6e4a..15b949b 100644 --- a/build/action.yml +++ b/build/action.yml @@ -67,7 +67,7 @@ runs: run: | if [[ -d tests ]]; then pip install pytest - pyrhon -m pytest + python -m pytest fi - name: Add the given package filename_prefix id: package-prefix-arg From 0691cdeae21e6184ae4ea8e22d57f367417b5b1c Mon Sep 17 00:00:00 2001 From: Alec Delaney <89490472+tekktrik@users.noreply.github.com> Date: Sat, 5 Aug 2023 20:14:04 -0400 Subject: [PATCH 16/28] Explain syntactical decision --- build/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/action.yml b/build/action.yml index 15b949b..076cd5d 100644 --- a/build/action.yml +++ b/build/action.yml @@ -67,7 +67,7 @@ runs: run: | if [[ -d tests ]]; then pip install pytest - python -m pytest + python -m pytest # This syntax adds the library to the path fi - name: Add the given package filename_prefix id: package-prefix-arg From fbb24d8be3004e5ccf6259f161fd2e8ff23664fd Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Sat, 28 Oct 2023 23:22:46 -0400 Subject: [PATCH 17/28] pin Python to 3.11 --- release-gh/action.yml | 4 ++-- release-pypi/action.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/release-gh/action.yml b/release-gh/action.yml index cca484d..d2d5afd 100644 --- a/release-gh/action.yml +++ b/release-gh/action.yml @@ -14,7 +14,7 @@ inputs: python-version: description: 'The version of Python to use in the CI' required: true - default: '3.x' + default: '3.11' package-prefix: description: | The prefix (or name) of your pacakge (if applicable) to use @@ -40,7 +40,7 @@ runs: awk -F '\/' '{ print tolower($2) }' | tr '_' '-' ) >> $GITHUB_OUTPUT - - name: Set up Python 3.x + - name: Set up requested Python version uses: actions/setup-python@v4 with: python-version: ${{ inputs.python-version }} diff --git a/release-pypi/action.yml b/release-pypi/action.yml index 6d43384..225a438 100644 --- a/release-pypi/action.yml +++ b/release-pypi/action.yml @@ -14,7 +14,7 @@ inputs: python-version: description: 'The version of Python to use in the CI' required: true - default: '3.x' + default: '3.11' runs: using: "composite" steps: From d9f3e7783249cd84f8bff4f0e1fe678419a526c1 Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Sun, 29 Oct 2023 16:12:51 -0700 Subject: [PATCH 18/28] Pin missed file to Python 3.11 --- build/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/action.yml b/build/action.yml index 076cd5d..d6f5306 100644 --- a/build/action.yml +++ b/build/action.yml @@ -8,7 +8,7 @@ inputs: python-version: description: 'The version of Python to use in the CI' required: true - default: '3.x' + default: '3.11' package-prefix: description: | The prefix (or name) of your pacakge (if applicable) to use @@ -27,7 +27,7 @@ runs: awk -F '\/' '{ print tolower($2) }' | tr '_' '-' ) >> $GITHUB_OUTPUT - - name: Set up Python 3.x + - name: Set up Python 3.11 uses: actions/setup-python@v4 with: python-version: ${{ inputs.python-version }} From 847c4802a863d1cafabcc01609bea9b40e0c56f3 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Sun, 21 Jan 2024 10:59:43 -0600 Subject: [PATCH 19/28] show any diff introduced by pre-commit during CI --- .github/workflows/build.yml | 2 +- build/action.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3ebfb49..d8e6fc3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,4 +25,4 @@ jobs: - name: Install pre-commit run: pip install pre-commit - name: Run pre-commit - run: pre-commit run --all-files + run: pre-commit run --all-files --show-diff-on-failure diff --git a/build/action.yml b/build/action.yml index 7495195..85997ce 100644 --- a/build/action.yml +++ b/build/action.yml @@ -61,7 +61,7 @@ runs: - name: Pre-commit hooks shell: bash run: | - pre-commit run --all-files + pre-commit run --all-files --show-diff-on-failure - name: Install pytest shell: bash run: pip install pytest From 519b1441d5114c0f0504c6eaf6102fd6d149f793 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Tue, 30 Jan 2024 15:34:56 -0500 Subject: [PATCH 20/28] Remove duplicate code --- build/action.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/build/action.yml b/build/action.yml index 992cbe1..6594c23 100644 --- a/build/action.yml +++ b/build/action.yml @@ -82,15 +82,6 @@ runs: else echo prefix-arg="--package_folder_prefix ${{ inputs.package-prefix }}" >> $GITHUB_OUTPUT fi - - name: Add the given package filename_prefix - id: package-prefix-arg - shell: bash - run: | - if [ "${{ inputs.package-prefix }}" == "" ]; then - echo prefix-arg="" >> $GITHUB_OUTPUT - else - echo prefix-arg="--package_folder_prefix ${{ inputs.package-prefix }}" >> $GITHUB_OUTPUT - fi - name: Build assets shell: bash run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location . ${{ steps.package-prefix-arg.outputs.prefix-arg }} From 3b2cf64faefd864989de23e9ecf6acf33fdefd86 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Tue, 30 Jan 2024 15:35:54 -0500 Subject: [PATCH 21/28] Fix typos --- build/action.yml | 2 +- release-gh/action.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/action.yml b/build/action.yml index 6594c23..5a8f986 100644 --- a/build/action.yml +++ b/build/action.yml @@ -11,7 +11,7 @@ inputs: default: '3.11' package-prefix: description: | - The prefix (or name) of your pacakge (if applicable) to use + The prefix (or name) of your package (if applicable) to use for GitHub releases required: true default: "" diff --git a/release-gh/action.yml b/release-gh/action.yml index d2d5afd..5a68ea4 100644 --- a/release-gh/action.yml +++ b/release-gh/action.yml @@ -17,7 +17,7 @@ inputs: default: '3.11' package-prefix: description: | - The prefix (or name) of your pacakge (if applicable) to use + The prefix (or name) of your package (if applicable) to use for GitHub releases required: true default: "" From dbbaf5c1554be773f20211b18a48c3c0903a49eb Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Mon, 12 Feb 2024 12:54:08 -0500 Subject: [PATCH 22/28] Add ignore bundle building argument --- build/action.yml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/build/action.yml b/build/action.yml index 5a8f986..f292880 100644 --- a/build/action.yml +++ b/build/action.yml @@ -15,6 +15,13 @@ inputs: for GitHub releases required: true default: "" + ignore-bundles: + description: | + A comma and space separated list of bundles to be skipped when building. + Valid options are py, mpy, example, and json. For example, to skip + building the MPY and example bundles, this field would be: mpy, example + required: true + default: "" runs: using: "composite" steps: @@ -82,9 +89,23 @@ runs: else echo prefix-arg="--package_folder_prefix ${{ inputs.package-prefix }}" >> $GITHUB_OUTPUT fi + - name: Add the given bundle ignores + id: ignore-bundles-arg + shell: bash + run: | + if [ "${{ inputs.ignore-bundles }}" == "" ]; then + echo ignore-bundles="" >> $GITHUB_OUTPUT + else + echo ignore-bundles='--ignore "${{ inputs.ignore-bundles }}"' >> $GITHUB_OUTPUT + fi - name: Build assets shell: bash - run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location . ${{ steps.package-prefix-arg.outputs.prefix-arg }} + run: | + circuitpython-build-bundles \ + --filename_prefix ${{ steps.repo-name.outputs.repo-name }} \ + --library_location . \ + ${{ steps.package-prefix-arg.outputs.prefix-arg }} \ + ${{ steps.ignore-bundles-arg.outputs.prefix-arg }} - name: Archive bundles uses: actions/upload-artifact@v3 with: From 730a98147ebb20912107958ce7bfa33ee527611d Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Mon, 12 Feb 2024 12:56:02 -0500 Subject: [PATCH 23/28] Update actions to Node 20 --- .github/workflows/build.yml | 4 ++-- build/action.yml | 6 +++--- release-gh/action.yml | 6 +++--- release-pypi/action.yml | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d8e6fc3..111d394 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,11 +15,11 @@ jobs: GITHUB_CONTEXT: ${{ toJson(github) }} run: echo "$GITHUB_CONTEXT" - name: Set up Python 3.x (Latest) - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.x" - name: Checkout current repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Install pre-commit diff --git a/build/action.yml b/build/action.yml index f292880..d1961d7 100644 --- a/build/action.yml +++ b/build/action.yml @@ -35,7 +35,7 @@ runs: tr '_' '-' ) >> $GITHUB_OUTPUT - name: Set up Python 3.11 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ inputs.python-version }} - name: Versions @@ -43,11 +43,11 @@ runs: run: | python3 --version - name: Checkout Current Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Checkout tools repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: adafruit/actions-ci-circuitpython-libs path: actions-ci diff --git a/release-gh/action.yml b/release-gh/action.yml index 5a68ea4..d658b5a 100644 --- a/release-gh/action.yml +++ b/release-gh/action.yml @@ -41,7 +41,7 @@ runs: tr '_' '-' ) >> $GITHUB_OUTPUT - name: Set up requested Python version - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ inputs.python-version }} - name: Versions @@ -49,11 +49,11 @@ runs: run: | python3 --version - name: Checkout Current Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Checkout tools repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: adafruit/actions-ci-circuitpython-libs path: actions-ci diff --git a/release-pypi/action.yml b/release-pypi/action.yml index 225a438..70dc0f8 100644 --- a/release-pypi/action.yml +++ b/release-pypi/action.yml @@ -18,7 +18,7 @@ inputs: runs: using: "composite" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Check For pyproject.toml id: need-pypi shell: bash @@ -26,7 +26,7 @@ runs: echo pyproject-toml=$( find . -wholename './pyproject.toml' ) >> $GITHUB_OUTPUT - name: Set up Python if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml') - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ inputs.python-version }} - name: Install dependencies From 3c83cf8c980f15c8961db3a808116f3236930fc9 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Mon, 12 Feb 2024 12:56:56 -0500 Subject: [PATCH 24/28] Don't dump GithHub context --- .github/workflows/build.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 111d394..1ac1194 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,10 +10,6 @@ jobs: test: runs-on: ubuntu-latest steps: - - name: Dump GitHub context - env: - GITHUB_CONTEXT: ${{ toJson(github) }} - run: echo "$GITHUB_CONTEXT" - name: Set up Python 3.x (Latest) uses: actions/setup-python@v5 with: From 169a37726a6edd10a32001f9aa33b7b2e3460456 Mon Sep 17 00:00:00 2001 From: Alec Delaney <89490472+tekktrik@users.noreply.github.com> Date: Tue, 13 Feb 2024 12:15:26 -0500 Subject: [PATCH 25/28] Don't show progress for checkout actions --- .github/workflows/build.yml | 1 + build/action.yml | 2 ++ release-gh/action.yml | 2 ++ release-pypi/action.yml | 2 ++ 4 files changed, 7 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1ac1194..fcd5366 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,6 +18,7 @@ jobs: uses: actions/checkout@v4 with: submodules: true + show-progress: false - name: Install pre-commit run: pip install pre-commit - name: Run pre-commit diff --git a/build/action.yml b/build/action.yml index d1961d7..b06ec9c 100644 --- a/build/action.yml +++ b/build/action.yml @@ -46,9 +46,11 @@ runs: uses: actions/checkout@v4 with: submodules: true + show-progress: false - name: Checkout tools repo uses: actions/checkout@v4 with: + show-progress: false repository: adafruit/actions-ci-circuitpython-libs path: actions-ci - name: Install dependencies diff --git a/release-gh/action.yml b/release-gh/action.yml index d658b5a..a71f5c8 100644 --- a/release-gh/action.yml +++ b/release-gh/action.yml @@ -52,9 +52,11 @@ runs: uses: actions/checkout@v4 with: submodules: true + show-progress: false - name: Checkout tools repo uses: actions/checkout@v4 with: + show-progress: false repository: adafruit/actions-ci-circuitpython-libs path: actions-ci - name: Install deps diff --git a/release-pypi/action.yml b/release-pypi/action.yml index 70dc0f8..74d3a6e 100644 --- a/release-pypi/action.yml +++ b/release-pypi/action.yml @@ -19,6 +19,8 @@ runs: using: "composite" steps: - uses: actions/checkout@v4 + with: + show-progress: false - name: Check For pyproject.toml id: need-pypi shell: bash From ff157d67eb708cb8aecc5c7bd9edc2f2e57873c4 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Tue, 13 Feb 2024 13:26:21 -0500 Subject: [PATCH 26/28] Fix using ouput of ignore-bundles-arg --- build/action.yml | 2 +- release-gh/action.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/action.yml b/build/action.yml index b06ec9c..20a0997 100644 --- a/build/action.yml +++ b/build/action.yml @@ -107,7 +107,7 @@ runs: --filename_prefix ${{ steps.repo-name.outputs.repo-name }} \ --library_location . \ ${{ steps.package-prefix-arg.outputs.prefix-arg }} \ - ${{ steps.ignore-bundles-arg.outputs.prefix-arg }} + ${{ steps.ignore-bundles-arg.outputs.ignore-bundles }} - name: Archive bundles uses: actions/upload-artifact@v3 with: diff --git a/release-gh/action.yml b/release-gh/action.yml index a71f5c8..e05fda7 100644 --- a/release-gh/action.yml +++ b/release-gh/action.yml @@ -88,7 +88,7 @@ runs: --filename_prefix ${{ steps.repo-name.outputs.repo-name }} \ --library_location . \ ${{ steps.package-prefix-arg.outputs.prefix-arg }} \ - ${{ steps.ignore-bundles-arg.outputs.prefix-arg }} + ${{ steps.ignore-bundles-arg.outputs.ignore-bundles }} - name: Upload Release Assets uses: shogo82148/actions-upload-release-asset@v1 with: From dd1bf13e0e0397b44a05ee893cf18e78d9f962b3 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Sun, 12 May 2024 12:06:40 -0400 Subject: [PATCH 27/28] use upload-artifact@v4, so it's using Node.js 20 --- build/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/action.yml b/build/action.yml index 20a0997..ebee117 100644 --- a/build/action.yml +++ b/build/action.yml @@ -109,7 +109,7 @@ runs: ${{ steps.package-prefix-arg.outputs.prefix-arg }} \ ${{ steps.ignore-bundles-arg.outputs.ignore-bundles }} - name: Archive bundles - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: bundles path: ${{ github.workspace }}/bundles/ From 1e102db7f54354969c6d27a5da6f42ff1292bae1 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Tue, 6 May 2025 10:07:21 -0500 Subject: [PATCH 28/28] use python 3.12 in build action --- build/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/action.yml b/build/action.yml index ebee117..d1f5bb9 100644 --- a/build/action.yml +++ b/build/action.yml @@ -8,7 +8,7 @@ inputs: python-version: description: 'The version of Python to use in the CI' required: true - default: '3.11' + default: '3.12' package-prefix: description: | The prefix (or name) of your package (if applicable) to use @@ -34,7 +34,7 @@ runs: awk -F '\/' '{ print tolower($2) }' | tr '_' '-' ) >> $GITHUB_OUTPUT - - name: Set up Python 3.11 + - name: Set up Python 3.12 uses: actions/setup-python@v5 with: python-version: ${{ inputs.python-version }}