From 720d0e3e868781345b442f8030dd269ccd072fb1 Mon Sep 17 00:00:00 2001 From: Ferronn Date: Sat, 28 Oct 2023 03:17:17 +0000 Subject: [PATCH] dump_and_merge: fix luacasc dep --- .github/workflows/dump_and_merge.yml | 4 ++-- code/lua/getexe-scm-0.rockspec | 17 +++++++++++++++++ code/lua/rocks.txt | 3 --- 3 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 code/lua/getexe-scm-0.rockspec delete mode 100644 code/lua/rocks.txt diff --git a/.github/workflows/dump_and_merge.yml b/.github/workflows/dump_and_merge.yml index f2dccaeabd1..7ceb2ed4163 100644 --- a/.github/workflows/dump_and_merge.yml +++ b/.github/workflows/dump_and_merge.yml @@ -45,10 +45,10 @@ jobs: uses: leafo/gh-actions-luarocks@v4 - name: Set up Luarocks if: "${{ github.event.inputs.url == '' }}" - run: cat code/lua/rocks.txt | xargs -n1 luarocks install + run: cd code/lua && luarocks make - name: Dump exe if: "${{ github.event.inputs.url == '' }}" - run: lua code/lua/getexe.lua ${{ github.event.inputs.product }} ${{ github.event.inputs.config }} + run: getexe ${{ github.event.inputs.product }} ${{ github.event.inputs.config }} - name: Setup .NET uses: actions/setup-dotnet@v3 with: diff --git a/code/lua/getexe-scm-0.rockspec b/code/lua/getexe-scm-0.rockspec new file mode 100644 index 00000000000..f76768edef4 --- /dev/null +++ b/code/lua/getexe-scm-0.rockspec @@ -0,0 +1,17 @@ +rockspec_format = '3.0' +package = 'getexe' +version = 'scm-0' +source = { url = '' } +dependencies = { + 'argparse', + 'luacasc < 1.16', + 'penlight', +} +build = { + type = 'none', + install = { + bin = { + getexe = 'getexe.lua', + }, + }, +} diff --git a/code/lua/rocks.txt b/code/lua/rocks.txt deleted file mode 100644 index 835b674bfff..00000000000 --- a/code/lua/rocks.txt +++ /dev/null @@ -1,3 +0,0 @@ -argparse -luacasc -penlight