Make software-report.md more workflow friendly

grafana · Nov 6, 2024 · 3e546db · 3e546db
1 parent eb54d65
commit 3e546db
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/packer-build-and-publish.yml b/.github/workflows/packer-build-and-publish.yml
@@ -185,12 +185,12 @@ jobs:
         run: |
           mkdir -p artifacts
           name=$(basename -s .pkr.hcl ${{ matrix.template }})
-          readme=$(git ls-files --others --exclude-standard -- '**/*.md')
-          mv "$readme" artifacts/readme-${name}.md
+          readme=$(git ls-files --others --exclude-standard -- '**/software-report.md')
+          mv "$readme" artifacts/${name}-software-report.md
           report=$(git ls-files --others --exclude-standard -- '**/software-report.json')
-          mv "$report" artifacts/software-report-${name}.json
+          mv "$report" artifacts/${name}-software-report.json
           manifest=$(git ls-files --others --exclude-standard -- '**/build-manifest.json')
-          mv "$manifest" artifacts/build-manifest-${name}.json
+          mv "$manifest" artifacts/${name}-build-manifest.json
           echo "name=$name" >> "${GITHUB_OUTPUT}"
 
       - name: Upload artifacts

diff --git a/images/ubuntu/templates/ubuntu-20.04.pkr.hcl b/images/ubuntu/templates/ubuntu-20.04.pkr.hcl
@@ -553,7 +553,7 @@ build {
   }
 
   provisioner "file" {
-    destination = "${path.root}/../Ubuntu2004-Readme.md"
+    destination = "${path.root}/../software-report.md"
     direction   = "download"
     source      = "${var.image_folder}/software-report.md"
   }

diff --git a/images/ubuntu/templates/ubuntu-22.04.arm64.pkr.hcl b/images/ubuntu/templates/ubuntu-22.04.arm64.pkr.hcl
@@ -544,7 +544,7 @@ build {
   }
 
   provisioner "file" {
-    destination = "${path.root}/../Ubuntu2204-arm64-Readme.md"
+    destination = "${path.root}/../software-report.md"
     direction   = "download"
     source      = "${var.image_folder}/software-report.md"
   }

diff --git a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl
@@ -542,7 +542,7 @@ build {
   }
 
   provisioner "file" {
-    destination = "${path.root}/../Ubuntu2204-Readme.md"
+    destination = "${path.root}/../software-report.md"
     direction   = "download"
     source      = "${var.image_folder}/software-report.md"
   }

diff --git a/images/ubuntu/templates/ubuntu-24.04.arm64.pkr.hcl b/images/ubuntu/templates/ubuntu-24.04.arm64.pkr.hcl
@@ -531,7 +531,7 @@ build {
   }
 
   provisioner "file" {
-    destination = "${path.root}/../Ubuntu2404-arm64-Readme.md"
+    destination = "${path.root}/../software-report.md"
     direction   = "download"
     source      = "${var.image_folder}/software-report.md"
   }

diff --git a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl
@@ -531,7 +531,7 @@ build {
   }
 
   provisioner "file" {
-    destination = "${path.root}/../Ubuntu2404-Readme.md"
+    destination = "${path.root}/../software-report.md"
     direction   = "download"
     source      = "${var.image_folder}/software-report.md"
   }