Pull staging changes upstream. (#113)
* Pull dev upstream to staging. (#112)
* Use awk to enclose filename in single quotes tar #99
* Add null field separator so filenames don't get broken up.
* Move upload logs up in the action sequence so it captures data before it gets deleted.
* Fix awk (#109)
---------
Co-authored-by: sn-o-w <cristian.silaghi@mozilla.ro>
* Fix awk delimiter.
Pull in fix by @sn-o-w in d0ee83b497
mentioned in issue #99
---------
Co-authored-by: sn-o-w <cristian.silaghi@mozilla.ro>
This commit is contained in:
parent
6f9e6a86db
commit
44c33b32f8
2 changed files with 9 additions and 8 deletions
14
action.yml
14
action.yml
|
@ -83,6 +83,13 @@ runs:
|
||||||
DEBUG: "${{ inputs.debug }}"
|
DEBUG: "${{ inputs.debug }}"
|
||||||
PACKAGES: "${{ inputs.packages }}"
|
PACKAGES: "${{ inputs.packages }}"
|
||||||
|
|
||||||
|
- id: upload-logs
|
||||||
|
if: ${{ inputs.debug == 'true' }}
|
||||||
|
uses: actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: cache-apt-pkgs-logs_${{ env.CACHE_KEY }}
|
||||||
|
path: ~/cache-apt-pkgs/*.log
|
||||||
|
|
||||||
- id: save-cache
|
- id: save-cache
|
||||||
if: ${{ ! steps.load-cache.outputs.cache-hit }}
|
if: ${{ ! steps.load-cache.outputs.cache-hit }}
|
||||||
uses: actions/cache/save@v3
|
uses: actions/cache/save@v3
|
||||||
|
@ -94,10 +101,3 @@ runs:
|
||||||
run: |
|
run: |
|
||||||
rm -rf ~/cache-apt-pkgs
|
rm -rf ~/cache-apt-pkgs
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
- id: upload-logs
|
|
||||||
if: ${{ inputs.debug == 'true' }}
|
|
||||||
uses: actions/upload-artifact@v3
|
|
||||||
with:
|
|
||||||
name: cache-apt-pkgs-logs_${{ env.CACHE_KEY }}
|
|
||||||
path: ~/cache-apt-pkgs/*.log
|
|
||||||
|
|
|
@ -92,7 +92,8 @@ for installed_package in ${installed_packages}; do
|
||||||
& get_install_script_filepath "" "${package_name}" "preinst" \
|
& get_install_script_filepath "" "${package_name}" "preinst" \
|
||||||
& get_install_script_filepath "" "${package_name}" "postinst"; } |
|
& get_install_script_filepath "" "${package_name}" "postinst"; } |
|
||||||
while IFS= read -r f; do test -f "${f}" -o -L "${f}" && get_tar_relpath "${f}"; done |
|
while IFS= read -r f; do test -f "${f}" -o -L "${f}" && get_tar_relpath "${f}"; done |
|
||||||
xargs -I {} echo \'{}\' | # Single quotes ensure literals like backslash get captured.
|
# Single quotes ensure literals like backslash get captured. Use \0 to avoid field separation.
|
||||||
|
awk -F"\0" '{print "\x27"$1"\x27"}' |
|
||||||
sudo xargs tar -cf "${cache_filepath}" -C /
|
sudo xargs tar -cf "${cache_filepath}" -C /
|
||||||
|
|
||||||
log " done (compressed size $(du -h "${cache_filepath}" | cut -f1))."
|
log " done (compressed size $(du -h "${cache_filepath}" | cut -f1))."
|
||||||
|
|
Loading…
Reference in a new issue