Made changes requested by @sommersoft

This commit is contained in:
dherrada 2020-01-11 20:28:57 -05:00
parent 2281afbcc6
commit 7adbcbaf32
2 changed files with 5 additions and 20 deletions

View file

@ -30,17 +30,11 @@ jobs:
submodules: true submodules: true
- name: Install deps - name: Install deps
run: | run: |
sudo apt-get install -y gettext gawk
pip install -r requirements.txt pip install -r requirements.txt
- name: Library version - name: Library version
run: git describe --dirty --always --tags run: git describe --dirty --always --tags
- name: Package Folder Prefix For circuitpython-build-tools (Community Bundle Specific)
id: pkg-folder
run: |
echo ::set-output name=prefix::$(
ls -RUx |
gawk -F '\n' '{ match($1, /(drivers|helpers)\/(.+)\/(.+)\:/, arr) ; if (length(arr[0]) > 0 && match(arr[3], arr[2]) > 0) printf "%s, ", arr[3] }' |
gawk '{ trimmed = substr($0, 1, length($0) - 2) ; print "\"" trimmed "\"" }'
)
- name: Build assets - name: Build assets
run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location libraries --library_depth 2 --package_folder_prefix ${{ steps.pkg-folder.outputs.prefix }} run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location libraries --library_depth 2
- name: Build docs
working-directory: docs
run: sphinx-build -E -W -b html . _build/html

View file

@ -32,18 +32,9 @@ jobs:
submodules: true submodules: true
- name: Install deps - name: Install deps
run: | run: |
sudo apt-get install -y gettext gawk
pip install -r requirements.txt pip install -r requirements.txt
- name: Package Folder Prefix For circuitpython-build-tools (Community Bundle Specific)
id: pkg-folder
run: |
echo ::set-output name=prefix::$(
ls -RUx |
gawk -F '\n' '{ match($1, /(drivers|helpers)\/(.+)\/(.+)\:/, arr) ; if (length(arr[0]) > 0 && match(arr[3], arr[2]) > 0) printf "%s, ", arr[3] }' |
gawk '{ trimmed = substr($0, 1, length($0) - 2) ; print "\"" trimmed "\"" }'
)
- name: Build assets - name: Build assets
run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location libraries --library_depth 2 --package_folder_prefix ${{ steps.pkg-folder.outputs.prefix }} run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location libraries --library_depth 2
- name: Upload Release Assets - name: Upload Release Assets
# the 'official' actions version does not yet support dynamically # the 'official' actions version does not yet support dynamically
# supplying asset names to upload. @csexton's version chosen based on # supplying asset names to upload. @csexton's version chosen based on