From 482bde4c00fa8342747d0f5cbdf0a80ad7f69eb0 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Mon, 11 Oct 2021 02:25:50 +0100
Subject: [PATCH] fix(workflows): use correct artifact name for build-plan

Also rename build-plan artifact from "build-plan.yml" to "build-plan".
---
 .github/workflows/_build.yml           | 12 ++++++------
 .github/workflows/_release.yml         |  2 +-
 .github/workflows/build.yml            |  2 +-
 .github/workflows/nightly-emacs-28.yml |  2 +-
 .github/workflows/nightly-master.yml   |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/_build.yml b/.github/workflows/_build.yml
index 8afc318..04854df 100644
--- a/.github/workflows/_build.yml
+++ b/.github/workflows/_build.yml
@@ -107,10 +107,10 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Show plan
         run: cat build-plan.yml
-      - name: Upload build-plan.yml artifact
+      - name: Upload build-plan artifact
         uses: actions/upload-artifact@v2
         with:
-          name: ${{ inputs.artifact_prefix }}build-plan.yml
+          name: ${{ inputs.artifact_prefix }}build-plan
           path: build-plan.yml
           if-no-files-found: error
       - name: Check if planned release and asset already exist
@@ -140,10 +140,10 @@ jobs:
       - name: Install dependencies
         run: make bootstrap-ci
         working-directory: builder
-      - name: Download build-plan.yml artifact
+      - name: Download build-plan artifact
         uses: actions/download-artifact@v2
         with:
-          name: ${{ inputs.artifact_prefix }}build-plan.yml
+          name: ${{ inputs.artifact_prefix }}build-plan
           path: ./
       - name: Build Emacs
         run: >-
@@ -174,10 +174,10 @@ jobs:
           path: bin
       - name: Ensure emacs-builder is executable
         run: chmod +x bin/emacs-builder
-      - name: Download build-plan.yml artifact
+      - name: Download build-plan artifact
         uses: actions/download-artifact@v2
         with:
-          name: ${{ inputs.artifact_prefix }}build-plan.yml
+          name: ${{ inputs.artifact_prefix }}build-plan
           path: ./
       - name: Download unsigned app artifact
         uses: actions/download-artifact@v2
diff --git a/.github/workflows/_release.yml b/.github/workflows/_release.yml
index 8a7edbc..c4137c8 100644
--- a/.github/workflows/_release.yml
+++ b/.github/workflows/_release.yml
@@ -5,7 +5,7 @@ on:
   workflow_call:
     inputs:
       plan_artifact:
-        description: Name of artifact containing a emacs-builder plan.yml file
+        description: Name of artifact containing a emacs-builder plan yaml file
         type: string
         required: true
       dmg_artifact:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dc64193..e09a2c2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,7 +61,7 @@ jobs:
     needs: [build]
     uses: jimeh/emacs-builds/.github/workflows/_release.yml@main
     with:
-      plan_artifact: big-sur_build-plan.yml
+      plan_artifact: build-plan
       dmg_artifact: dmg
     secrets:
       TAP_REPO_TOKEN: ${{ secrets.TAP_REPO_TOKEN }}
diff --git a/.github/workflows/nightly-emacs-28.yml b/.github/workflows/nightly-emacs-28.yml
index 941c85c..7e31a33 100644
--- a/.github/workflows/nightly-emacs-28.yml
+++ b/.github/workflows/nightly-emacs-28.yml
@@ -41,7 +41,7 @@ jobs:
     needs: [build]
     uses: jimeh/emacs-builds/.github/workflows/_release.yml@main
     with:
-      plan_artifact: catalina_build-plan.yml
+      plan_artifact: build-plan
       dmg_artifact: dmg
     secrets:
       TAP_REPO_TOKEN: ${{ secrets.TAP_REPO_TOKEN }}
diff --git a/.github/workflows/nightly-master.yml b/.github/workflows/nightly-master.yml
index 85a1278..8ab4fcd 100644
--- a/.github/workflows/nightly-master.yml
+++ b/.github/workflows/nightly-master.yml
@@ -41,7 +41,7 @@ jobs:
     needs: [build]
     uses: jimeh/emacs-builds/.github/workflows/_release.yml@main
     with:
-      plan_artifact: catalina_build-plan.yml
+      plan_artifact: build-plan
       dmg_artifact: dmg
     secrets:
       TAP_REPO_TOKEN: ${{ secrets.TAP_REPO_TOKEN }}