Merge pull request #1430 from nhsuk/release-zip-filename

Set release zip filename using `NPM_PACKAGE_VERSION`

Author: colinrotherham

.github/workflows/release.yml

@@ -10,6 +10,10 @@ jobs:
     name: Create release
     runs-on: ubuntu-latest
 
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      NPM_PACKAGE_VERSION: ${GITHUB_REF_NAME/v/}
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -32,43 +36,35 @@ jobs:
       - name: Run tests
         run: npm test --ignore-scripts
 
-      - name: Get package version
-        id: get_version
-        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/}
-
       - name: Create release artifact
         run: npm run release --workspace nhsuk-frontend
 
       - name: Create release
         id: create_release
         uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ github.ref }}
           release_name: ${{ github.ref }}
           draft: false
-          prerelease: ${{ contains(steps.get_version.outputs.VERSION, '-') }}
+          prerelease: ${{ contains(env.NPM_PACKAGE_VERSION, '-') }}
 
       - name: Upload release asset
         id: upload-release-asset
         uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./dist/nhsuk-frontend-${{ steps.get_version.outputs.VERSION }}.zip
-          asset_name: nhsuk-frontend-${{ steps.get_version.outputs.VERSION }}.zip
+          asset_path: ./dist/nhsuk-frontend-${{ env.NPM_PACKAGE_VERSION }}.zip
+          asset_name: nhsuk-frontend-${{ env.NPM_PACKAGE_VERSION }}.zip
           asset_content_type: application/zip
 
       - name: Publish npm package
-        if: ${{ !contains(steps.get_version.outputs.VERSION, '-') }}
+        if: ${{ !contains(env.NPM_PACKAGE_VERSION, '-') }}
         run: npm publish --dry-run --workspace nhsuk-frontend --tag latest
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
 
       - name: Publish npm package (pre-release)
-        if: ${{ contains(steps.get_version.outputs.VERSION, '-') }}
+        if: ${{ contains(env.NPM_PACKAGE_VERSION, '-') }}
         run: npm publish --dry-run --workspace nhsuk-frontend --tag next
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}

packages/nhsuk-frontend/tasks/release.mjs

@@ -5,6 +5,9 @@ import { files, task } from '@nhsuk/frontend-tasks'
 import gulp from 'gulp'
 import gulpZip from 'gulp-zip'
 
+// Prefer release version if available
+const { NPM_PACKAGE_VERSION = config.version } = process.env
+
 export const copy = gulp.parallel(
   /**
    * Copy GitHub release logos, icons and other assets
@@ -23,7 +26,7 @@ export const copy = gulp.parallel(
     files.copy('nhsuk/nhsuk-frontend.min.js', {
       srcPath: join(config.paths.pkg, 'dist'),
       destPath: join(config.paths.root, 'dist'),
-      output: { file: `nhsuk-frontend-${config.version}.min.js` }
+      output: { file: `nhsuk-frontend-${NPM_PACKAGE_VERSION}.min.js` }
     })
   ),
 
@@ -34,7 +37,7 @@ export const copy = gulp.parallel(
     files.copy('nhsuk/nhsuk-frontend.min.css', {
       srcPath: join(config.paths.pkg, 'dist'),
       destPath: join(config.paths.root, 'dist'),
-      output: { file: `nhsuk-frontend-${config.version}.min.css` }
+      output: { file: `nhsuk-frontend-${NPM_PACKAGE_VERSION}.min.css` }
     })
   )
 )
@@ -56,7 +59,7 @@ export const zip = gulp.series(
           encoding: false
         }
       )
-      .pipe(gulpZip(`nhsuk-frontend-${config.version}.zip`))
+      .pipe(gulpZip(`nhsuk-frontend-${NPM_PACKAGE_VERSION}.zip`))
       .pipe(gulp.dest(join(config.paths.root, 'dist')))
   )
 )