Fix artifact name (#558)

* fixes issue with naming snapshots in upload action --------- Co-authored-by: Aphral Griffin <[email protected]> Co-authored-by: aphralG <[email protected]>
nginx · Feb 6, 2024 · c3bd562 · c3bd562
1 parent 71ae09c
commit c3bd562
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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