From c3bd562d5b341bc1156ac625b542c2814b6fd861 Mon Sep 17 00:00:00 2001
From: oliveromahony <oliveromahony+github@gmail.com>
Date: Tue, 6 Feb 2024 14:34:00 +0000
Subject: [PATCH] Fix artifact name (#558)

* fixes issue with naming snapshots in upload action

---------

Co-authored-by: Aphral Griffin <a.griffin@f5.com>
Co-authored-by: aphralG <108004222+aphralG@users.noreply.github.com>
---
 .github/workflows/ci.yml | 14 +++++++-------
 Makefile                 |  1 -
 Makefile.packaging       |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 57aae146c0..72b4fa0d46 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -94,13 +94,13 @@ jobs:
             package_type=local-package
       - name: Build Packages
         run: |
-          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@v4
         with:
-          name: nginx-agent-snapshots
+          name: nginx-agent-unsigned-snapshots
           path: build
-          retention-days: 3
+          retention-days: 1
 
   integration-tests:
     name: Integration Tests
@@ -145,11 +145,11 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-           go-version: '1.21.6'
+          go-version-file: 'go.mod'
       - name: Download Packages
         uses: actions/download-artifact@v4
         with:
-          name: nginx-agent-snapshots
+          name: nginx-agent-unsigned-snapshots
           path: build
       - name: Run Integration Tests
         run: |
@@ -233,9 +233,9 @@ jobs:
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: nginx-agent-snapshots
+          name: nginx-agent-signed-snapshots
           path: ./build/azure/packages/nginx-agent.tar.gz
-          retention-days: 3
+          retention-days: 1
       - name: Azure Login
         uses: azure/login@v1
         with:
diff --git a/Makefile b/Makefile
index 0327219b79..d4eaf8f462 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,6 @@ run: ## Run code
 run-debug: ## Run code
 	./build/nginx-agent
 
-
 build: ## Build agent executable
 	GOWORK=off CGO_ENABLED=0 GOARCH=${OSARCH} go build -pgo=auto -ldflags=${LDFLAGS} -o ./build/nginx-agent 
 
diff --git a/Makefile.packaging b/Makefile.packaging
index ffbfa524ad..45b2c0a3ef 100644
--- a/Makefile.packaging
+++ b/Makefile.packaging
@@ -5,7 +5,7 @@
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 PACKAGES_DIR        := ./build/packages
 GITHUB_PACKAGES_DIR := ./build/github/packages
-AZURE_PACKAGES_DIR := ./build/azure/packages
+AZURE_PACKAGES_DIR  := ./build/azure/packages
 GPG_PUBLIC_KEY      := .key
 
 DEB_DISTROS?=ubuntu-jammy-22.04 ubuntu-focal-20.04 debian-bookworm-12 debian-bullseye-11