Improve packing scripts

Author: colin969

.github/workflows/main.yml

@@ -43,7 +43,7 @@ jobs:
       uses: softprops/action-gh-release@v1
       with:
         tag_name: ${{ steps.package_version.outputs.version }}
-        name: ${{ github.repository }} ${{ steps.package_version.outputs.version }}
+        name: ${{ github.repository.name }} ${{ steps.package_version.outputs.version }}
         generate_release_notes: true
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -63,6 +63,12 @@ jobs:
         cache: 'npm'
 
     - run: npm install
+
+    - name: Get artifact name
+      id: artifact_info
+      run: |
+        ARTIFACT_NAME=$(node -p "require('./package.json').artifactName")
+        echo "artifact_name=$ARTIFACT_NAME" >> $GITHUB_OUTPUT
     
     - name: Build and Package Release
       run: |
@@ -74,6 +80,6 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ needs.create-release.outputs.upload_url }}
-        asset_path: ./extension.zip
-        asset_name: extension.zip
+        asset_path: ./${{ steps.artifact_info.outputs.artifact_name }}
+        asset_name: ${{ steps.artifact_info.outputs.artifact_name }}
         asset_content_type: application/zip

gulpfile.js

@@ -5,6 +5,9 @@ const zip = require('gulp-zip');
 const webpack = require('webpack');
 const merge = require('merge-stream');
 const webpackConfig = require('./webpack.config.js')
+const packageJson = require('./package.json');
+
+const folder = (packageJson.author + '_' + packageJson.name).toLowerCase().replace(' ', '-');
 
 const filesToCopy = [
     'package.json',
@@ -31,18 +34,18 @@ function build(cb) {
 function stage() {
     const streams = filesToCopy.map(file => {
         if (fs.existsSync(file)) {
-            return gulp.src(file).pipe(gulp.dest('package/analytics'));
+            return gulp.src(file).pipe(gulp.dest(`package/${folder}`));
         }
     }).filter(s => s != undefined);
     return merge([
         ...streams,
-        gulp.src('dist/**/*').pipe(gulp.dest('package/analytics/dist')),
-        gulp.src('static/**/*').pipe(gulp.dest('package/analytics/static')),
+        gulp.src('dist/**/*').pipe(gulp.dest(`package/${folder}/dist`)),
+        gulp.src('static/**/*').pipe(gulp.dest(`package/${folder}/static`)),
     ]);
 }
 
 function package() {
-    return gulp.src('package/**/*').pipe(zip('extension.zip')).pipe(gulp.dest('.'));
+    return gulp.src('package/**/*').pipe(zip(packageJson.artifactName)).pipe(gulp.dest('.'));
 }
 
 exports.clean = clean;

package.json

@@ -6,6 +6,7 @@
   "launcherVersion": "10.0.0",
   "description": "Opt-in collection of information on Flashpoint usage.",
   "icon": "icon.png",
+  "artifactName": "analytics-ext.zip",
   "main": "./dist/ext.js",
   "contributes": {
     "configuration": [