Skip to content

Commit 7b40622

Browse files
committed
fix upload of tarball
1 parent 998c74a commit 7b40622

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

.github/workflows/upload-release-assets.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,10 @@ jobs:
6363
echo "Checking Packages in ${{inputs.pkgRepo}}/nginx-agent"
6464
echo "${{secrets.PUBTEST_CERT}}" > pubtest.crt
6565
echo "${{secrets.PUBTEST_KEY}}" > pubtest.key
66-
PKG_REPO=${{inputs.pkgRepo}} CERT=pubtest.crt KEY=pubtest.key DL=1 scripts/packages/package-check.sh ${{inputs.pkgVersion}}
67-
find ${{inputs.pkgRepo}}/nginx-agent | grep -e "nginx-agent[_-]${{inputs.pkgVersion}}"
66+
67+
DL=1 PKG_REPO=${{inputs.pkgRepo}} \
68+
CERT=pubtest.crt KEY=pubtest.key \
69+
scripts/packages/package-check.sh ${{inputs.pkgVersion}}
6870

6971
- name: GitHub Upload
7072
if: ${{ needs.vars.outputs.github_release == 'true' }}
@@ -87,10 +89,10 @@ jobs:
8789
uses: azure/CLI@9f7ce6f37c31b777ec6c6b6d1dfe7db79f497956 # v2.2.0
8890
with:
8991
inlineScript: |
90-
echo "Uploading tarball to Azure Storage Account"
92+
echo "Uploading tarball to Azure..."
9193
az storage blob upload --auth-mode=login -f "${{ inputs.pkgRepo }}/nginx-agent/nginx-agent.tar.gz" \
9294
-c ${{ secrets.AZURE_CONTAINER_NAME }} \
93-
--account-name ${{ secrets.AZURE_ACCOUNT_NAME }} --overwrite -n ${dest}
95+
--account-name ${{ secrets.AZURE_ACCOUNT_NAME }} --overwrite -n nginx-agent/release-${{ inputs.pkgVersion }}/nginx-agent.tar.gz
9496
for i in $(find ${{ inputs.pkgRepo }}/nginx-agent | grep -e "nginx-agent[_-]${{ inputs.pkgVersion }}"); do
9597
dest="nginx-agent/release-${{ inputs.pkgVersion }}/${i##*/}"
9698
echo "Uploading ${i} to ${dest}"

scripts/packages/package-check.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,14 +237,13 @@ prepare_packages() {
237237
}
238238

239239
create_tarball() {
240-
echo -n "Creating tarball of downloaded packages... "
240+
echo "Creating tarball of downloaded packages... "
241241
tar -czvf "${PKG_DIR}/nginx-agent.tar.gz" ${PKG_DIR}/azure/*
242242
if [[ $? != 0 ]]; then
243243
echo -e "${RED}Failed to create tarball!${NC}"
244244
return
245245
fi
246-
echo -e "${GREEN}Done${NC}"
247-
echo "SAVED: ${PKG_DIR}/nginx-agent/nginx-agent.tar.gz"
246+
echo "SAVED: ${PKG_DIR}/nginx-agent.tar.gz"
248247
}
249248

250249
# Main

0 commit comments

Comments
 (0)