From 8f973e9a486a6b6fca4db76300cd3c4f1bae123f Mon Sep 17 00:00:00 2001 From: Ottatop Date: Fri, 2 Aug 2024 14:54:49 -0500 Subject: [PATCH] Checkout where github wants you to --- .github/workflows/lcat.yml | 3 ++- .github/workflows/ldoc.yml | 54 -------------------------------------- 2 files changed, 2 insertions(+), 55 deletions(-) delete mode 100644 .github/workflows/ldoc.yml diff --git a/.github/workflows/lcat.yml b/.github/workflows/lcat.yml index 3c290bd..af524df 100644 --- a/.github/workflows/lcat.yml +++ b/.github/workflows/lcat.yml @@ -21,7 +21,7 @@ jobs: uses: actions/checkout@v4 with: repository: Ottatop/lcat - path: ../lcat + path: ./lcat - name: Get Rust toolchain uses: dtolnay/rust-toolchain@stable - name: Cache stuff @@ -30,6 +30,7 @@ jobs: # run: sudo apt remove needrestart && sudo apt update && sudo apt install libwayland-dev libxkbcommon-dev libudev-dev libinput-dev libgbm-dev libseat-dev libsystemd-dev protobuf-compiler xwayland libegl-dev liblua5.4-dev libdisplay-info-dev - name: Generate docs run: | + mv ./lcat .. cd ../lcat cargo run -- --dir "../pinnacle/api/lua" - name: Push classes diff --git a/.github/workflows/ldoc.yml b/.github/workflows/ldoc.yml deleted file mode 100644 index 362d140..0000000 --- a/.github/workflows/ldoc.yml +++ /dev/null @@ -1,54 +0,0 @@ -# From https://github.com/lunarmodules/ldoc/blob/master/.github/workflows/doc.yml - -# Based on https://gist.github.com/domenic/ec8b0fc8ab45f39403dd -name: Build Lua Docs -on: - pull_request: - branches: - - main - paths: - - "api/lua/**" - push: - branches: - - main - paths: - - "api/lua/**" - workflow_dispatch: - -env: - BRANCH_NAME: ${{ github.head_ref || github.ref_name }} - -jobs: - build-docs: - name: Build Lua docs - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - submodules: recursive - - name: Get ldoc_gen - uses: actions/checkout@v4 - with: - repository: Ottatop/ldoc_gen - path: ./ldoc_gen - - name: Setup Lua - uses: leafo/gh-actions-lua@v10 - with: - luaVersion: "5.4" - - name: Setup Lua Rocks - uses: leafo/gh-actions-luarocks@v4 - - name: Setup dependencies - run: luarocks install ldoc - - name: Generate LDoc compatible code - run: mv ldoc_gen .. && cd ../ldoc_gen && cargo run -- -p ../pinnacle/api/lua - - name: Build docs - run: cd ../ldoc_gen/.ldoc_gen && cp ../../pinnacle/resources/ldoc.css ../../pinnacle/resources/config.ld . && ldoc . - - name: Deploy - uses: peaceiris/actions-gh-pages@v3 - with: - deploy_key: ${{ secrets.DOCS_DEPLOY_KEY_LUA }} - external_repository: pinnacle-comp/lua-reference - publish_dir: ../ldoc_gen/.ldoc_gen/doc - destination_dir: ${{ env.BRANCH_NAME }} - # force_orphan: true