feat: Merge sub-actions (#35)

peaceiris · Sep 15, 2020 · 2dc3689 · 2dc3689
1 parent 667f6bf
commit 2dc3689
Show file tree

Hide file tree

Showing 21 changed files with 46 additions and 228 deletions.
diff --git a/.github/workflows/suggest-related-links-train.yml b/.github/workflows/suggest-related-links-train.yml
diff --git a/.github/workflows/suggest-related-links.yml b/.github/workflows/suggest-related-links.yml
@@ -5,9 +5,14 @@ on:
     types:
       - opened
       - edited
+  workflow_dispatch:
+  schedule:
+    - cron: '13 13 * * */7'
 
 jobs:
-  suggest:
+  action:
     runs-on: ubuntu-18.04
     steps:
       - uses: peaceiris/actions-suggest-related-links@v0.4.0
+        with:
+          repository: 'peaceiris/actions-gh-pages'
diff --git a/README.md b/README.md
@@ -1,15 +1,31 @@
+## Suggest Related Links Action
+
+A GitHub Action to suggest related or similar issues, documents, and links. Based on the power of NLP and fastText.
+
+
+
+## Table of Contents
+
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
-**Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
 
-- [Suggest Related Links Action](#suggest-related-links-action)
+
 - [Maintainers](#maintainers)
+- [License](#license)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
-## Suggest Related Links Action
 
-A GitHub Action to suggest related or similar issues, documents, and links. Based on the power of NLP and fastText.
 
+## Maintainers
+
+- [peaceiris (Shohei Ueda)](https://github.com/peaceiris)
+- [S-Kaisei (Kaisei Shimura)](https://github.com/S-Kaisei)
+
+
+
+## License
+
+MIT License
 
-## Maintainers 
+<div align="right"><a href="#table-of-contents">Back to TOC ☝️</a></div>
diff --git a/action.yml b/action.yml
@@ -3,7 +3,7 @@ description: 'A GitHub Action to suggest related or similar issues, documents, a
 author: 'peaceiris'
 runs:
   using: 'node12'
-  main: 'actions/suggest/dist/index.js'
+  main: 'actions/dist/index.js'
 branding:
   icon: 'link'
   color: 'orange'
@@ -28,6 +28,18 @@ inputs:
     description: 'Set a model for suggesting.'
     default: 'fasttext'
     required: false
+  repository:
+    description: 'Set a repository name of issue source. (e.g. peaceiris/actions-gh-pages)'
+    default: ${{ github.repository }}
+    required: false
+  custom_training_data:
+    description: 'Set paths to JSON files including custom training data.'
+    default: ''
+    required: false
+  train_issues:
+    description: 'Set this to true to train issue data.'
+    default: 'true'
+    required: false
 outputs:
   json_path:
     description: 'A path to a JSON file that contains results.'
diff --git a/actions/train/.gitignore → actions/.gitignore b/actions/train/.gitignore → actions/.gitignore
diff --git a/actions/train/__tests__/get-inputs.test.ts → actions/__tests__/get-inputs.test.ts b/actions/train/__tests__/get-inputs.test.ts → actions/__tests__/get-inputs.test.ts
@@ -10,7 +10,7 @@ beforeEach(() => {
   process.stdout.write = jest.fn();
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const doc: any = yaml.safeLoad(fs.readFileSync(__dirname + '/../action.yml', 'utf8'));
+  const doc: any = yaml.safeLoad(fs.readFileSync(__dirname + '/../../action.yml', 'utf8'));
   Object.keys(doc.inputs).forEach(name => {
     const envVar = `INPUT_${name.replace(/ /g, '_').toUpperCase()}`;
     process.env[envVar] = doc.inputs[name]['default'];
@@ -19,7 +19,7 @@ beforeEach(() => {
 
 afterEach(() => {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const doc: any = yaml.safeLoad(fs.readFileSync(__dirname + '/../action.yml', 'utf8'));
+  const doc: any = yaml.safeLoad(fs.readFileSync(__dirname + '/../../action.yml', 'utf8'));
   Object.keys(doc.inputs).forEach(name => {
     const envVar = `INPUT_${name.replace(/ /g, '_').toUpperCase()}`;
     console.debug(`delete ${envVar}\t${process.env[envVar]}`);

diff --git a/actions/train/src/get-inputs.ts → actions/src/get-inputs.ts b/actions/train/src/get-inputs.ts → actions/src/get-inputs.ts
diff --git a/actions/train/src/github-api.ts → actions/src/github-api.ts b/actions/train/src/github-api.ts → actions/src/github-api.ts
diff --git a/actions/suggest/src/index.ts → actions/src/index.ts b/actions/suggest/src/index.ts → actions/src/index.ts
diff --git a/actions/train/src/interfaces.ts → actions/src/interfaces.ts b/actions/train/src/interfaces.ts → actions/src/interfaces.ts
diff --git a/actions/train/src/main.ts → actions/src/main.ts b/actions/train/src/main.ts → actions/src/main.ts
diff --git a/actions/suggest/README.md b/actions/suggest/README.md
diff --git a/actions/suggest/__tests__/get-inputs.test.ts b/actions/suggest/__tests__/get-inputs.test.ts
diff --git a/actions/suggest/src/get-inputs.ts b/actions/suggest/src/get-inputs.ts
diff --git a/actions/suggest/src/interfaces.ts b/actions/suggest/src/interfaces.ts
diff --git a/actions/suggest/src/main.ts b/actions/suggest/src/main.ts
diff --git a/actions/train/README.md b/actions/train/README.md
diff --git a/actions/train/action.yml b/actions/train/action.yml
diff --git a/actions/train/src/index.ts b/actions/train/src/index.ts
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "actions-suggest-related-links",
   "version": "0.4.0",
   "description": "A GitHub Action to suggest related or similar issues, documents, and links. Based on the power of NLP and fastText.",
-  "main": "lib/index.js",
+  "main": "actions/dist/index.js",
   "engines": {
     "node": ">=12.18.3",
     "npm": ">=6.14.8"
@@ -13,9 +13,7 @@
     "lint": "eslint ./actions/**/*.ts",
     "lint:fix": "eslint --fix ./actions/**/*.ts",
     "test": "jest --coverage --verbose --detectOpenHandles",
-    "build": "npm run build:suggest && npm run build:train",
-    "build:suggest": "ncc build ./actions/suggest/src/index.ts -o ./actions/suggest/dist --minify",
-    "build:train": "ncc build ./actions/train/src/index.ts -o ./actions/train/dist --minify",
+    "build": "ncc build ./actions/src/index.ts -o ./actions/dist --minify",
     "tsc": "tsc",
     "fmt": "prettier --write **/*.ts",
     "fmt:check": "prettier --check **/*.ts",

diff --git a/release.sh b/release.sh
@@ -50,14 +50,12 @@ fi
 npm ci
 
 npm run build
-git add ./actions/suggest/dist/index.js
-git add ./actions/train/dist/index.js
+git add ./actions/dist/index.js
 git commit -m "chore(release): Add build assets"
 
 npm run release -- --release-as "${RELEASE_TYPE}" --preset eslint
 
-git rm ./actions/suggest/dist/index.js
-git rm ./actions/train/dist/index.js
+git rm ./actions/dist/index.js
 git commit -m "chore(release): Remove build assets [skip ci]"
 
 if [ "${CURRENT_BRANCH}" != "${DEFAULT_BRANCH}" ]; then