Skip to content

cache only submodules in tools/ #7513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dhalbert wants to merge 1 commit into from
Closed

cache only submodules in tools/ #7513

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/fetch_submodules/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ inputs:
submodules:
description: 'The submodules to cache'
required: false
default: '["extmod/ulab", "lib/", "tools/"]'
default: '["extmod/ulab", "lib/", "tools/adabot", "tools/bitmap_font", "tools/huffman", "tools/python-semver", "tools/Tecate-bitmap-fonts", "tools/uf2", "tools/usb_descriptor"]'
Copy link
Copy Markdown
Collaborator

@microdev1 microdev1 Jan 30, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Directories are allowed here. Only the submodule paths are fed to actions/cache.

Following line does the conversion:

circuitpython/.github/actions/fetch_submodules/action.yml

Line 41 in 72981cf

echo $(cut -d ' ' -f 2 submodule_status) | echo "submodules=[\"$(sed "s/ /\", \"/g")\"]" >> $GITHUB_OUTPUT

From the logs:

Run actions/cache@v3
  with:
    path: .git/modules/
  extmod/ulab
  lib/adafruit_floppy
  lib/axtls
  lib/berkeley-db-1.xx
  lib/certificates/nina-fw
  lib/libffi
  lib/mbedtls
  lib/mp3
  lib/nrfutil
  lib/protomatter
  lib/quirc
  lib/tinyusb
  tools/Tecate-bitmap-fonts
  tools/adabot
  tools/bitmap_font
  tools/huffman
  tools/python-semver
  tools/uf2
  tools/usb_descriptor
    key: submodules-common-f01551f27a11d33e88cfb801bd3cbba6613aec14d2b92201488289f81061fc96
    enableCrossOsArchive: true

Copy link
Copy Markdown
Collaborator Author

@dhalbert dhalbert Jan 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you understand why @tannewt found 78aca07 necessary, then? He saw a build fail that seemed to be due to caching an old version of something (not a submodule) in tools/

Copy link
Copy Markdown
Member

@tannewt tannewt Jan 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was an older version of the caching code. Perhaps this new version works ok.

Copy link
Copy Markdown
Collaborator Author

@dhalbert dhalbert Jan 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aha, ok, I'll close this for now, then

type: string

cache:
Expand Down