Skip to content

Commit 04ef714

Browse files
authored
Merge pull request #35 from tekktrik/dev/update
Add ignore argument, update actions
2 parents a2d4368 + 169a377 commit 04ef714

File tree

4 files changed

+39
-15
lines changed

4 files changed

+39
-15
lines changed

.github/workflows/build.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,15 @@ jobs:
1010
test:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- name: Dump GitHub context
14-
env:
15-
GITHUB_CONTEXT: ${{ toJson(github) }}
16-
run: echo "$GITHUB_CONTEXT"
1713
- name: Set up Python 3.x (Latest)
18-
uses: actions/setup-python@v4
14+
uses: actions/setup-python@v5
1915
with:
2016
python-version: "3.x"
2117
- name: Checkout current repo
22-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
2319
with:
2420
submodules: true
21+
show-progress: false
2522
- name: Install pre-commit
2623
run: pip install pre-commit
2724
- name: Run pre-commit

build/action.yml

+27-4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ inputs:
1515
for GitHub releases
1616
required: true
1717
default: ""
18+
ignore-bundles:
19+
description: |
20+
A comma and space separated list of bundles to be skipped when building.
21+
Valid options are py, mpy, example, and json. For example, to skip
22+
building the MPY and example bundles, this field would be: mpy, example
23+
required: true
24+
default: ""
1825
runs:
1926
using: "composite"
2027
steps:
@@ -28,20 +35,22 @@ runs:
2835
tr '_' '-'
2936
) >> $GITHUB_OUTPUT
3037
- name: Set up Python 3.11
31-
uses: actions/setup-python@v4
38+
uses: actions/setup-python@v5
3239
with:
3340
python-version: ${{ inputs.python-version }}
3441
- name: Versions
3542
shell: bash
3643
run: |
3744
python3 --version
3845
- name: Checkout Current Repo
39-
uses: actions/checkout@v3
46+
uses: actions/checkout@v4
4047
with:
4148
submodules: true
49+
show-progress: false
4250
- name: Checkout tools repo
43-
uses: actions/checkout@v3
51+
uses: actions/checkout@v4
4452
with:
53+
show-progress: false
4554
repository: adafruit/actions-ci-circuitpython-libs
4655
path: actions-ci
4756
- name: Install dependencies
@@ -82,9 +91,23 @@ runs:
8291
else
8392
echo prefix-arg="--package_folder_prefix ${{ inputs.package-prefix }}" >> $GITHUB_OUTPUT
8493
fi
94+
- name: Add the given bundle ignores
95+
id: ignore-bundles-arg
96+
shell: bash
97+
run: |
98+
if [ "${{ inputs.ignore-bundles }}" == "" ]; then
99+
echo ignore-bundles="" >> $GITHUB_OUTPUT
100+
else
101+
echo ignore-bundles='--ignore "${{ inputs.ignore-bundles }}"' >> $GITHUB_OUTPUT
102+
fi
85103
- name: Build assets
86104
shell: bash
87-
run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location . ${{ steps.package-prefix-arg.outputs.prefix-arg }}
105+
run: |
106+
circuitpython-build-bundles \
107+
--filename_prefix ${{ steps.repo-name.outputs.repo-name }} \
108+
--library_location . \
109+
${{ steps.package-prefix-arg.outputs.prefix-arg }} \
110+
${{ steps.ignore-bundles-arg.outputs.prefix-arg }}
88111
- name: Archive bundles
89112
uses: actions/upload-artifact@v3
90113
with:

release-gh/action.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,22 @@ runs:
4141
tr '_' '-'
4242
) >> $GITHUB_OUTPUT
4343
- name: Set up requested Python version
44-
uses: actions/setup-python@v4
44+
uses: actions/setup-python@v5
4545
with:
4646
python-version: ${{ inputs.python-version }}
4747
- name: Versions
4848
shell: bash
4949
run: |
5050
python3 --version
5151
- name: Checkout Current Repo
52-
uses: actions/checkout@v3
52+
uses: actions/checkout@v4
5353
with:
5454
submodules: true
55+
show-progress: false
5556
- name: Checkout tools repo
56-
uses: actions/checkout@v3
57+
uses: actions/checkout@v4
5758
with:
59+
show-progress: false
5860
repository: adafruit/actions-ci-circuitpython-libs
5961
path: actions-ci
6062
- name: Install deps

release-pypi/action.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,17 @@ inputs:
1818
runs:
1919
using: "composite"
2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
22+
with:
23+
show-progress: false
2224
- name: Check For pyproject.toml
2325
id: need-pypi
2426
shell: bash
2527
run: |
2628
echo pyproject-toml=$( find . -wholename './pyproject.toml' ) >> $GITHUB_OUTPUT
2729
- name: Set up Python
2830
if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml')
29-
uses: actions/setup-python@v4
31+
uses: actions/setup-python@v5
3032
with:
3133
python-version: ${{ inputs.python-version }}
3234
- name: Install dependencies

0 commit comments

Comments
 (0)