From 494665355f3655317222d01e0a2f9df33ba89930 Mon Sep 17 00:00:00 2001 From: NoM0Re Date: Tue, 18 Feb 2025 17:25:42 +0100 Subject: [PATCH] update workflow --- .github/workflows/lint-pr.yml | 38 +++++++++++++++++------------------ .github/workflows/lint.yml | 38 +++++++++++++++++------------------ 2 files changed, 36 insertions(+), 40 deletions(-) diff --git a/.github/workflows/lint-pr.yml b/.github/workflows/lint-pr.yml index 4de5cbb..13c127b 100644 --- a/.github/workflows/lint-pr.yml +++ b/.github/workflows/lint-pr.yml @@ -11,26 +11,26 @@ jobs: env: LUA_VERSION: 5.1.5 - LUAROCKS_VERSION: 2.4.2 + LUAROCKS_VERSION: 3.9.2 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Cache Lua - uses: actions/cache@v1 + uses: actions/cache@v3 id: luacache with: - path: .lua + path: ~/.lua key: ${{ runner.os }}-lua-${{ env.LUA_VERSION }} restore-keys: | ${{ runner.os }}-lua-${{ env.LUA_VERSION }} - name: Cache LuaRocks - uses: actions/cache@v1 + uses: actions/cache@v3 id: luarockscache with: - path: .luarocks + path: ~/.luarocks key: ${{ runner.os }}-luarocks-${{ env.LUAROCKS_VERSION }} restore-keys: | ${{ runner.os }}-luarocks-${{ env.LUAROCKS_VERSION }} @@ -38,25 +38,23 @@ jobs: - name: Install Lua if: steps.luacache.outputs.cache-hit != 'true' run: | - sudo apt-get install libreadline-dev libncurses-dev - wget https://www.lua.org/ftp/lua-${{ env.LUA_VERSION }}.tar.gz -O - | tar -xzf - - cd lua-${{ env.LUA_VERSION }} - make linux - make -j INSTALL_TOP=$GITHUB_WORKSPACE/.lua install - rm -rf $GITHUB_WORKSPACE/lua-${{ env.LUA_VERSION }} + sudo apt-get update + sudo apt-get install -y lua5.1 liblua5.1-0-dev + mkdir -p ~/.lua/bin + ln -s /usr/bin/lua5.1 ~/.lua/bin/lua - name: Install LuaRocks and Luacheck if: steps.luarockscache.outputs.cache-hit != 'true' run: | - wget https://luarocks.org/releases/luarocks-${{ env.LUAROCKS_VERSION }}.tar.gz -O - | tar -xzf - + wget https://luarocks.org/releases/luarocks-${{ env.LUAROCKS_VERSION }}.tar.gz + tar -xzf luarocks-${{ env.LUAROCKS_VERSION }}.tar.gz cd luarocks-${{ env.LUAROCKS_VERSION }} - ./configure --with-lua-bin=$GITHUB_WORKSPACE/.lua/bin --prefix=$GITHUB_WORKSPACE/.luarocks - make build + ./configure --prefix=$HOME/.luarocks --with-lua-include=/usr/include/lua5.1 + make make install - PATH=$PATH:$GITHUB_WORKSPACE/.luarocks/bin + echo "export PATH=\$HOME/.luarocks/bin:\$PATH" >> ~/.bashrc + source ~/.bashrc luarocks install luacheck - luarocks install lanes - rm -rf $GITHUB_WORKSPACE/luarocks-${{ env.LUAROCKS_VERSION }} - - name: Luacheck - run: .luarocks/bin/luacheck . -q + - name: Run Luacheck + run: ~/.luarocks/bin/luacheck . -q diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 7673ae7..fe4d92c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,26 +12,26 @@ jobs: env: LUA_VERSION: 5.1.5 - LUAROCKS_VERSION: 2.4.2 + LUAROCKS_VERSION: 3.9.2 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Cache Lua - uses: actions/cache@v1 + uses: actions/cache@v3 id: luacache with: - path: .lua + path: ~/.lua key: ${{ runner.os }}-lua-${{ env.LUA_VERSION }} restore-keys: | ${{ runner.os }}-lua-${{ env.LUA_VERSION }} - name: Cache LuaRocks - uses: actions/cache@v1 + uses: actions/cache@v3 id: luarockscache with: - path: .luarocks + path: ~/.luarocks key: ${{ runner.os }}-luarocks-${{ env.LUAROCKS_VERSION }} restore-keys: | ${{ runner.os }}-luarocks-${{ env.LUAROCKS_VERSION }} @@ -39,25 +39,23 @@ jobs: - name: Install Lua if: steps.luacache.outputs.cache-hit != 'true' run: | - sudo apt-get install libreadline-dev libncurses-dev - wget https://www.lua.org/ftp/lua-${{ env.LUA_VERSION }}.tar.gz -O - | tar -xzf - - cd lua-${{ env.LUA_VERSION }} - make linux - make -j INSTALL_TOP=$GITHUB_WORKSPACE/.lua install - rm -rf $GITHUB_WORKSPACE/lua-${{ env.LUA_VERSION }} + sudo apt-get update + sudo apt-get install -y lua5.1 liblua5.1-0-dev + mkdir -p ~/.lua/bin + ln -s /usr/bin/lua5.1 ~/.lua/bin/lua - name: Install LuaRocks and Luacheck if: steps.luarockscache.outputs.cache-hit != 'true' run: | - wget https://luarocks.org/releases/luarocks-${{ env.LUAROCKS_VERSION }}.tar.gz -O - | tar -xzf - + wget https://luarocks.org/releases/luarocks-${{ env.LUAROCKS_VERSION }}.tar.gz + tar -xzf luarocks-${{ env.LUAROCKS_VERSION }}.tar.gz cd luarocks-${{ env.LUAROCKS_VERSION }} - ./configure --with-lua-bin=$GITHUB_WORKSPACE/.lua/bin --prefix=$GITHUB_WORKSPACE/.luarocks - make build + ./configure --prefix=$HOME/.luarocks --with-lua-include=/usr/include/lua5.1 + make make install - PATH=$PATH:$GITHUB_WORKSPACE/.luarocks/bin + echo "export PATH=\$HOME/.luarocks/bin:\$PATH" >> ~/.bashrc + source ~/.bashrc luarocks install luacheck - luarocks install lanes - rm -rf $GITHUB_WORKSPACE/luarocks-${{ env.LUAROCKS_VERSION }} - - name: Luacheck - run: .luarocks/bin/luacheck . -q + - name: Run Luacheck + run: ~/.luarocks/bin/luacheck . -q