diff --git a/not.github/workflows/build.yml b/.github/workflows/build.yml similarity index 62% rename from not.github/workflows/build.yml rename to .github/workflows/build.yml index ccd80da..82182dc 100644 --- a/not.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,20 +6,18 @@ 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.6 - uses: actions/setup-python@v1 + - name: Set up Python 3.11 + uses: actions/setup-python@v4 with: - python-version: 3.6 + python-version: 3.11 - name: Versions run: | python3 --version - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 with: submodules: true + - name: Fetch correct submodule shas + run: git submodule foreach 'git fetch --tags --depth 1 origin $sha1 && git checkout -q $sha1' - name: Install deps run: | sudo apt-get install -y gettext gawk diff --git a/not.github/workflows/release.yml b/.github/workflows/release.yml similarity index 64% rename from not.github/workflows/release.yml rename to .github/workflows/release.yml index e6c1ce0..ff14877 100644 --- a/not.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,28 +8,26 @@ jobs: upload-release-assets: runs-on: ubuntu-latest steps: - - name: Dump GitHub context - env: - GITHUB_CONTEXT: ${{ toJson(github) }} - run: echo "$GITHUB_CONTEXT" - name: Translate Repo Name For Build Tools filename_prefix id: repo-name run: | - echo ::set-output name=repo-name::$( + echo "repo-name=$( echo ${{ github.repository }} | awk -F '\/' '{ print tolower($2) }' | tr '_' '-' - ) - - name: Set up Python 3.6 - uses: actions/setup-python@v1 + )" >> $GITHUB_OUTPUT + - name: Set up Python 3.11 + uses: actions/setup-python@v4 with: - python-version: 3.6 + python-version: 3.11 - name: Versions run: | python3 --version - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 with: submodules: true + - name: Fetch correct submodule shas + run: git submodule foreach 'git fetch --tags --depth 1 origin $sha1 && git checkout -q $sha1' - name: Install deps run: | sudo apt-get install -y gettext gawk @@ -37,24 +35,19 @@ jobs: - name: Package Folder Prefix For circuitpython-build-tools (Community Bundle Specific) id: pkg-folder run: | - echo ::set-output name=prefix::$( + echo 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 "\"" }' - ) + ) >> $GITHUB_OUTPUT - 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 }} - name: Upload Release Assets - # the 'official' actions version does not yet support dynamically - # supplying asset names to upload. @csexton's version chosen based on - # discussion in the issue below, as its the simplest to implement and - # allows for selecting files with a pattern. - # https://github.com/actions/upload-release-asset/issues/4 - #uses: actions/upload-release-asset@v1.0.1 - uses: csexton/release-asset-action@master + uses: shogo82148/actions-upload-release-asset@v1 with: - pattern: "bundles/*" - github-token: ${{ secrets.GITHUB_TOKEN }} + asset_path: "bundles/*" + github_token: ${{ secrets.GITHUB_TOKEN }} + upload_url: ${{ github.event.release.upload_url }} - name: Upload Assets To AWS S3 env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} diff --git a/.gitmodules b/.gitmodules index 3fe37e7..fe16155 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,9 @@ [submodule "libraries/helpers/displayio_annotation"] path = libraries/helpers/displayio_annotation url = https://github.com/circuitpython/CircuitPython_Org_DisplayIO_Annotation.git +[submodule "libraries/helpers/displayio_dial"] + path = libraries/helpers/displayio_dial + url = https://github.com/circuitpython/CircuitPython_Org_DisplayIO_Dial.git +[submodule "libraries/helpers/displayio_effects"] + path = libraries/helpers/displayio_effects + url = https://github.com/circuitpython/CircuitPython_Org_DisplayIO_Effects.git diff --git a/build.sh b/build.sh index 748ec9e..c8ec2e6 100755 --- a/build.sh +++ b/build.sh @@ -28,14 +28,8 @@ set -e P=$( 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 -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 "\"" }' ) -if [ -z "$P" ]; then - P="" -else - P="--package_folder_prefix $P" -fi - -circuitpython-build-bundles --filename_prefix circuitpython-org-bundle --library_location libraries --library_depth 2 "$P" +circuitpython-build-bundles --filename_prefix circuitpython-org-bundle --library_location libraries --library_depth 2 --package_folder_prefix "$P" diff --git a/libraries/helpers/displayio_annotation b/libraries/helpers/displayio_annotation index 3485d5d..12819ff 160000 --- a/libraries/helpers/displayio_annotation +++ b/libraries/helpers/displayio_annotation @@ -1 +1 @@ -Subproject commit 3485d5de3fcc46991ab3739b1ce8f2b30cbcef99 +Subproject commit 12819ffaa729ccb91740976c557a683525a7b559 diff --git a/libraries/helpers/displayio_dial b/libraries/helpers/displayio_dial new file mode 160000 index 0000000..a56e59f --- /dev/null +++ b/libraries/helpers/displayio_dial @@ -0,0 +1 @@ +Subproject commit a56e59f5eb483a70998ee13170d33a89c160a1ea diff --git a/libraries/helpers/displayio_effects b/libraries/helpers/displayio_effects new file mode 160000 index 0000000..c8b9d22 --- /dev/null +++ b/libraries/helpers/displayio_effects @@ -0,0 +1 @@ +Subproject commit c8b9d221947547352884e94562b764efcbd32308