diff --git a/.github/actions/setup-pesde/action.yml b/.github/actions/setup-pesde/action.yml new file mode 100644 index 0000000..927a509 --- /dev/null +++ b/.github/actions/setup-pesde/action.yml @@ -0,0 +1,29 @@ +name: Install pesde +description: Installs pesde CLI and authenticates with the registry + +inputs: + pesde-token: + description: "Token for publishing to the pesde registry" + required: false + +runs: + using: composite + steps: + - name: Download pesde + shell: bash + run: | + latest_release=$(curl -s https://api.github.com/repos/pesde-pkg/pesde/releases | jq '[.[] | select(.prerelease == true or .prerelease == false)][0]') + download_url=$(echo "$latest_release" | jq -r '.assets[] | select(.name | endswith("linux-x86_64.tar.gz")) | .browser_download_url') + + curl -L -o /tmp/pesde.tar.gz "$download_url" + tar -xzvf /tmp/pesde.tar.gz + chmod +x pesde + + ./pesde self-install + rm ./pesde + echo "$HOME/.pesde/bin" >> $GITHUB_PATH + + - name: Authenticate into pesde registry + if: inputs.pesde-token != '' + shell: bash + run: pesde auth login --token "${{ inputs.pesde-token }}" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b1f972..ea17f27 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,12 +16,15 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Install pesde - uses: 2jammers/setup-pesde@v0.2.0 + - name: Install tooling + uses: CompeyDev/setup-rokit@v0.1.2 with: - lune-version: v0.8.9 - pesde-version: v0.5.0-rc.14 - token: ${{ secrets.PESDE_TOKEN }} + cache: true + + - name: Install pesde + uses: ./.github/actions/setup-pesde + with: + pesde-token: ${{ secrets.PESDE_TOKEN }} - name: Install dependencies run: pesde install @@ -36,12 +39,15 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Install pesde - uses: 2jammers/setup-pesde@v0.2.0 + - name: Install tooling + uses: CompeyDev/setup-rokit@v0.1.2 with: - lune-version: v0.8.9 - pesde-version: v0.5.0-rc.14 - token: ${{ secrets.PESDE_TOKEN }} + cache: true + + - name: Install pesde + uses: ./.github/actions/setup-pesde + with: + pesde-token: ${{ secrets.PESDE_TOKEN }} - name: Install dependencies run: pesde install @@ -59,12 +65,15 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Install pesde - uses: 2jammers/setup-pesde@v0.2.0 + - name: Install tooling + uses: CompeyDev/setup-rokit@v0.1.2 with: - lune-version: v0.8.9 - pesde-version: v0.5.0-rc.14 - token: ${{ secrets.PESDE_TOKEN }} + cache: true + + - name: Install pesde + uses: ./.github/actions/setup-pesde + with: + pesde-token: ${{ secrets.PESDE_TOKEN }} - name: Install dependencies run: pesde install diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e691c42..015a6ee 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -13,11 +13,9 @@ jobs: uses: actions/checkout@v4 - name: Install pesde - uses: 2jammers/setup-pesde@v0.2.0 + uses: ./.github/actions/setup-pesde with: - lune-version: v0.8.9 - pesde-version: v0.5.0-rc.14 - token: ${{ secrets.PESDE_TOKEN }} + pesde-token: ${{ secrets.PESDE_TOKEN }} - name: Install dependencies run: pesde install diff --git a/.lune/fmt.luau b/.lune/fmt.luau index a60edd7..76bbd7f 100644 --- a/.lune/fmt.luau +++ b/.lune/fmt.luau @@ -4,11 +4,4 @@ local process = require("@lune/process") local CommandBuilder = require("./exec") -process.exit( - CommandBuilder.new("stylua") - :withArg("--") - :withArg(".") - :withArgs(process.args) - :withStdioStrategy("forward") - :exec().code -) +process.exit(CommandBuilder.new("stylua"):withArg("."):withArgs(process.args):withStdioStrategy("forward"):exec().code) diff --git a/.lune/typecheck.luau b/.lune/typecheck.luau index 992fd4a..6602e16 100644 --- a/.lune/typecheck.luau +++ b/.lune/typecheck.luau @@ -6,7 +6,6 @@ local CommandBuilder = require("./exec") process.exit( CommandBuilder.new("luau-lsp") - :withArg("--") :withArg("analyze") :withArgs({ "--settings", ".vscode/settings.json" }) :withArgs({ "--ignore", "'**/.pesde/**'" }) diff --git a/pesde.toml b/pesde.toml index c5f0614..5949200 100644 --- a/pesde.toml +++ b/pesde.toml @@ -19,8 +19,6 @@ result = { name = "lukadev_0/result", version = "^1.2.0" } [dev_dependencies] frktest = { name = "itsfrank/frktest", target = "lune", version = "^0.0.2" } -stylua = { name = "pesde/stylua", version = "^2.0.1", target = "lune" } -luau_lsp = { name = "pesde/luau_lsp", version = "^1.36.0", target = "lune" } [indices] default = "https://github.com/daimond113/pesde-index"