Attempt to reduce action depth by 1

techmatters · Sep 7, 2022 · 8b4d5c7 · 8b4d5c7
1 parent 682bdf9
commit 8b4d5c7
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 22 deletions.
diff --git a/.github/actions/generate-next-tag/action.yml b/.github/actions/generate-next-tag/action.yml
diff --git a/.github/actions/generate-pre-release/action.yml b/.github/actions/generate-pre-release/action.yml
@@ -38,11 +38,11 @@ runs:
 
     # Generate next tag
     - name: Generate next tag
-      # TODO: remove branch tag
-      uses: techmatters/flex-plugins/.github/actions/generate-pre-release@gian_CHI-1262-p2
-      with:
-        prefix: "${{ inputs.tag-prefix }}-${{ inputs.tag-suffix }}"
-        latest-matching-tag: ${{ steps.latest_matching_tag.outputs.tag }}
+      run: node ${{ github.action_path }}/dist/generate-next-tag.js
+      shell: bash
+      env:
+        PREFIX: "${{ inputs.tag-prefix }}-${{ inputs.tag-suffix }}"
+        LATEST_MATCHING_TAG: ${{ steps.latest_matching_tag.outputs.tag }}
       id: generate_next_tag
 
     - run: echo ${{ steps.generate_next_tag.outputs.generated-tag }}

diff --git a/...b/actions/generate-next-tag/dist/index.js → ...ctions/generate-pre-release/dist/index.js b/...b/actions/generate-next-tag/dist/index.js → ...ctions/generate-pre-release/dist/index.js
@@ -2856,8 +2856,8 @@ __nccwpck_require__.r(__webpack_exports__);
 
 
 async function generateNextTag() {
-  const prefix = (0,_actions_core__WEBPACK_IMPORTED_MODULE_0__.getInput)('prefix', { required: true });
-  const latestTag = (0,_actions_core__WEBPACK_IMPORTED_MODULE_0__.getInput)('latest-matching-tag');
+  const prefix = process.env.PREFIX;
+  const latestTag = process.env.LATEST_MATCHING_TAG;
 
   // If no latest tag found, return this as the first iteration for this prefix
   if (!latestTag) {

diff --git a/.github/actions/generate-next-tag/index.js → ...generate-pre-release/generate-next-tag.js b/.github/actions/generate-next-tag/index.js → ...generate-pre-release/generate-next-tag.js
@@ -5,11 +5,11 @@
  * For details see https://docs.github.com/en/actions/creating-actions/creating-a-javascript-action#commit-tag-and-push-your-action-to-github 
 */ 
 
-import { getInput, setOutput, setFailed } from '@actions/core';
+import { setOutput, setFailed } from '@actions/core';
 
 async function generateNextTag() {
-  const prefix = getInput('prefix', { required: true });
-  const latestTag = getInput('latest-matching-tag');
+  const prefix = process.env.PREFIX;
+  const latestTag = process.env.LATEST_MATCHING_TAG;
 
   // If no latest tag found, return this as the first iteration for this prefix
   if (!latestTag) {

diff --git a/...tions/generate-next-tag/package-lock.json → ...ns/generate-pre-release/package-lock.json b/...tions/generate-next-tag/package-lock.json → ...ns/generate-pre-release/package-lock.json
diff --git a/...ub/actions/generate-next-tag/package.json → ...actions/generate-pre-release/package.json b/...ub/actions/generate-next-tag/package.json → ...actions/generate-pre-release/package.json