From 8e72312fe39749f9500cb5a08a7bf16a754f9aad Mon Sep 17 00:00:00 2001 From: Aphral Griffin Date: Tue, 6 Feb 2024 13:34:45 +0000 Subject: [PATCH] comment --- .github/workflows/ci.yml | 6 +++--- Makefile.packaging | 6 +----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f67f3da02b..f9ffa84d3f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -94,11 +94,11 @@ jobs: package_type=local-package - name: Build Packages run: | - PACKAGE_POSTFIX=${{ github.run_id }} make clean local-deb-package local-rpm-package local-txz-package local-apk-package + make clean local-deb-package local-rpm-package local-txz-package local-apk-package - name: Upload Artifacts uses: actions/upload-artifact@v3 with: - name: nginx-agent-snapshots + name: nginx-agent-unsigned-snapshots path: build retention-days: 1 @@ -233,7 +233,7 @@ jobs: - name: Upload Artifacts uses: actions/upload-artifact@v3 with: - name: nginx-agent + name: nginx-agent-signed-snapshots path: ./build/azure/packages/nginx-agent.tar.gz retention-days: 1 - name: Azure Login diff --git a/Makefile.packaging b/Makefile.packaging index c2046d20b9..b0e9988721 100644 --- a/Makefile.packaging +++ b/Makefile.packaging @@ -178,11 +178,7 @@ package: gpg-key $(PACKAGES_DIR) $(GITHUB_PACKAGES_DIR) $(AZURE_PACKAGES_DIR) ## find $(PACKAGES_DIR)/txz ;\ echo "Github packages:"; \ find $(GITHUB_PACKAGES_DIR) ;\ - echo "Packages Dir" ;\ - ls ${PACKAGES_DIR} ;\ - echo "Packages ./" ;\ - ls ./ ;\ - cd $(PACKAGES_DIR) && tar -czvf "./${PACKAGE_PREFIX}.tar.gz" * && cd ../.. && cp "${PACKAGES_DIR}/${PACKAGE_PREFIX}.tar.gz" "${AZURE_PACKAGES_DIR}/${PACKAGE_PREFIX}{PACKAGE_POSTFIX}.tar.gz"; \ + cd $(PACKAGES_DIR) && tar -czvf "./${PACKAGE_PREFIX}.tar.gz" * && cd ../.. && cp "${PACKAGES_DIR}/${PACKAGE_PREFIX}.tar.gz" "${AZURE_PACKAGES_DIR}/${PACKAGE_PREFIX}.tar.gz"; \ echo "Azure packages:"; \ find $(AZURE_PACKAGES_DIR) ;