diff --git a/.github/actions/download-cache-and-artifacts/action.yml b/.github/actions/download-cache-and-artifacts/action.yml index 3532902c78..6f03b05edb 100644 --- a/.github/actions/download-cache-and-artifacts/action.yml +++ b/.github/actions/download-cache-and-artifacts/action.yml @@ -6,12 +6,10 @@ inputs: description: 'packages to cache' required: false type: string - default: 'dist nxcache' persistent-packages: description: 'cache key' required: false type: string - default: 'nxcache' cache-key-suffix: description: 'cache key suffix' required: false @@ -25,8 +23,7 @@ runs: env: REMOTE_PATH: "adf/build-cache/${{ github.run_id }}" run: | - packages=( $(echo ${{ inputs.packages }}) ) - for i in "${packages[@]}"; do + for i in '${{ inputs.packages }}'; do echo "downloading current run cache artifacts from ${REMOTE_PATH}/$i.tar.gz" time aws s3 cp --no-progress s3://${S3_BUILD_BUCKET_SHORT_NAME}/${REMOTE_PATH}/$i.tar.gz $i.tar.gz du -h $i.tar.gz @@ -40,8 +37,7 @@ runs: if [ -n "${{ inputs.cache-key-suffix }}" ]; then REMOTE_PATH="${REMOTE_PATH}-${{ inputs.cache-key-suffix }}" fi - packages=( $(echo ${{ inputs.persistent-packages }}) ) - for i in "${packages[@]}"; do + for i in '${{ inputs.persistent-packages }}'; do REMOTE_FILE_PATH="s3://${S3_BUILD_BUCKET_SHORT_NAME}/${REMOTE_PATH}/$i.tar.gz" cache_exists=$(aws s3 ls $REMOTE_FILE_PATH > /dev/null) if [ $cache_exists -eq 0 ]; then diff --git a/.github/actions/upload-cache-and-artifacts/action.yml b/.github/actions/upload-cache-and-artifacts/action.yml index 10710dc4b8..ca4010c505 100644 --- a/.github/actions/upload-cache-and-artifacts/action.yml +++ b/.github/actions/upload-cache-and-artifacts/action.yml @@ -5,12 +5,10 @@ inputs: description: 'packages to cache' required: false type: boolean - default: 'dist' persistent-packages: description: 'cache key' required: false type: string - default: 'nxcache' cache-key-suffix: description: 'cache key suffix' required: false @@ -24,8 +22,7 @@ runs: env: REMOTE_PATH: "adf/build-cache/${{ github.run_id }}" run: | - packages=( $(echo ${{ inputs.packages }}) ) - for i in "${packages[@]}"; do + for i in '${{ inputs.packages }}'; do time tar czf $i.tar.gz $i du -h $i.tar.gz echo "uploading current run artifacts to ${REMOTE_PATH}/$i.tar.gz" @@ -39,8 +36,7 @@ runs: if [ -n "${{ inputs.cache-key-suffix }}" ]; then REMOTE_PATH="${REMOTE_PATH}-${{ inputs.cache-key-suffix }}" fi - packages=( $(echo ${{ inputs.persistent-packages }}) ) - for i in "${packages[@]}"; do + for i in '${{ inputs.persistent-packages }}'; do time tar czf $i.tar.gz $i du -h $i.tar.gz echo "pushing persistent cache to $REMOTE_PATH"