Просмотр исходного кода

chore: simplify generation of test build's name

tophf 4 лет назад
Родитель
Сommit
b4be70a3d0
3 измененных файлов с 13 добавлено и 8 удалено
  1. 1 0
      .eslintignore
  2. 5 6
      .github/workflows/ci.yml
  3. 7 2
      scripts/action-helper.js

+ 1 - 0
.eslintignore

@@ -1,6 +1,7 @@
 **/*.js
 !src/**
 !test/**
+!scripts/action-helper.js
 !scripts/fake-dep-loader.js
 !scripts/manifest-helper.js
 !scripts/plaid.conf.js

+ 5 - 6
.github/workflows/ci.yml

@@ -28,16 +28,15 @@ jobs:
       - name: Build
         run: yarn && yarn build
 
-      - name: Upload Artifact - get version
-        uses: nyaa8/package-version@v1
-      - name: Upload Artifact - get short SHA
-        uses: benjlevesque/[email protected]
-        id: short-sha
+      - name: Get version and SHA
+        run: node scripts/action-helper.js
+        with:
+          type: ci
       - name: Upload Artifact
         uses: actions/upload-artifact@v2
         continue-on-error: true
         with:
-          name: 'Violentmonkey-test-webext-v${{ env.PACKAGE_VERSION }}-git${{ steps.short-sha.outputs.sha }}'
+          name: 'Violentmonkey-test-webext-${{ env.GIT_DESCRIBE }}'
           path: 'dist/*'
           if-no-files-found: error
           retention-days: 30

+ 7 - 2
scripts/action-helper.js

@@ -4,6 +4,7 @@ const { getVersion, isBeta } = require('./version-helper');
 
 const version = getVersion();
 const beta = isBeta();
+const ci = core.getInput('type') === 'ci';
 
 const envs = {
   VERSION: version,
@@ -18,12 +19,13 @@ const envs = {
   PRERELEASE: !!beta,
   TEMP_DIR: 'tmp',
   ASSETS_DIR: 'dist-assets',
+  GIT_DESCRIBE: ci && exec('git describe --abbrev=7'),
 };
 
 envs.ASSET_ZIP = `${envs.RELEASE_PREFIX}-webext-v${envs.VERSION}.zip`;
 envs.ASSET_SELF_HOSTED_ZIP = `${envs.RELEASE_PREFIX}-webext-ffself-v${envs.VERSION}.zip`;
 
-envs.RELEASE_NOTE = beta ? `\
+envs.RELEASE_NOTE = beta && !ci ? `\
 **This is a beta release of Violentmonkey (also in [WebStore](\
 https://chrome.google.com/webstore/detail/violentmonkey-beta/opokoaglpekkimldnlggpoagmjegichg\
 )), use it at your own risk.**<br>\
@@ -41,7 +43,6 @@ Object.entries(envs).forEach(([key, value]) => {
 });
 
 function listCommits() {
-  const exec = cmd => childProcess.execSync(cmd, {encoding: 'utf8'}).trim();
   const thisTag = exec('git describe --abbrev=0 --tags');
   const prevTag = exec(`git describe --abbrev=0 --tags "${thisTag}^"`);
   return exec(`git log --oneline --skip=1 --reverse "${prevTag}...${thisTag}"`)
@@ -51,3 +52,7 @@ function listCommits() {
   .map(str => str.split('\n')[1])
   .join('\n');
 }
+
+function exec(cmd) {
+  return childProcess.execSync(cmd, { encoding: 'utf8' }).trim();
+}