fix: use github.action_path

nvim-neorocks · Mar 19, 2023 · 4843187 · 4843187
1 parent f4457ef
commit 4843187
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/action.yml b/action.yml
@@ -45,8 +45,7 @@ inputs:
       - make
   template:
     description: "Path to a rockspec template."
-    required: true
-    default: "resources/rockspec.template"
+    required: false
   upload:
     description: |
       Whether to upload to LuaRocks.
@@ -64,9 +63,7 @@ runs:
   using: "composite"
   steps:
     - uses: cachix/install-nix-action@v20
-    - run: echo "${{ github.action_path }}" >> $GITHUB_PATH
-      shell: bash
-    - run: nix profile install ".#luarocks-tag-release-action"
+    - run: nix profile install "${{ github.action_path }}#luarocks-tag-release-action"
       shell: bash
     - run: luarocks-tag-release-action
       env:

diff --git a/bin/luarocks-tag-release-action.lua b/bin/luarocks-tag-release-action.lua
@@ -8,6 +8,8 @@ local function getenv_or_empty(env_var)
   return os.getenv(env_var) or ''
 end
 
+local action_path = getenv_or_err('GITHUB_ACTION_PATH')
+
 local github_repo = getenv_or_err('GITHUB_REPOSITORY')
 
 local repo_name = assert(
@@ -85,6 +87,7 @@ local function parse_copy_directory_args(str_args)
 end
 
 local license_input = os.getenv('INPUT_LICENSE')
+local template_input = os.getenv('INPUT_TEMPLATE')
 
 ---@type Args
 local args = {
@@ -99,7 +102,7 @@ local args = {
   summary = getenv_or_empty('INPUT_SUMMARY'),
   detailed_description_lines = parse_list_args(getenv_or_empty('INPUT_DETAILED_DESCRIPTION')),
   build_type = getenv_or_err('INPUT_BUILD_TYPE'),
-  rockspec_template_file_path = getenv_or_err('INPUT_TEMPLATE'),
+  rockspec_template_file_path = template_input or action_path .. '/resources/rockspec.template',
   upload = getenv_or_err('INPUT_UPLOAD') == 'true',
   license = license_input ~= '' and license_input or nil,
 }