diff --git a/.github/actions/fix-stuff/action.yml b/.github/actions/fix-stuff/action.yml deleted file mode 100644 index a06627b..0000000 --- a/.github/actions/fix-stuff/action.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Fix Formatting & Generate UUIDs -description: Fixes formatiting, generates missing UUUIDs and commits changes - -inputs: - commit_author: - description: Main author for any commits made - required: true - -outputs: - changes_detected: - description: Whether any changes were detected after formatting and generating UUIDs - value: ${{ steps.commit-changes.outputs.changes_detected }} - -runs: - using: composite - steps: - - uses: ./.github/actions/setup - - - name: Format Code - shell: bash - run: npm run format - - - name: Generate UUIDs - shell: bash - run: npm run gen:uuids - - - name: Commit Formatted Code & Generated UUIDs - id: commit-changes - uses: stefanzweifel/git-auto-commit-action@v7 - with: - commit_author: ${{ inputs.commit_author }} - commit_user_name: osrs-taskbot - commit_user_email: r.mobis+taskbot@gmail.com - commit_message: "[skip-fix] format everything and generate missing UUIDs" diff --git a/.github/workflows/continuous-link-linting.yml b/.github/workflows/continuous-link-linting.yml index 51d5127..5314e08 100644 --- a/.github/workflows/continuous-link-linting.yml +++ b/.github/workflows/continuous-link-linting.yml @@ -6,7 +6,7 @@ on: jobs: lint-links: - runs-on: ubuntu-latest + runs-on: ubuntu-slim steps: - name: Checkout repository diff --git a/.github/workflows/fix-and-lint.yml b/.github/workflows/fix-and-lint.yml index d5854b7..97a373e 100644 --- a/.github/workflows/fix-and-lint.yml +++ b/.github/workflows/fix-and-lint.yml @@ -101,6 +101,7 @@ jobs: commit_user_name: osrs-taskbot commit_user_email: r.mobis+taskbot@gmail.com commit_message: "[skip-fix] format and generate missing UUIDs" + disable_pull_request_target_trigger_warning: true lint-gate: name: Lint Gate @@ -128,17 +129,18 @@ jobs: - uses: ./.github/actions/setup - - name: Lint code - run: npm run lint:ultracite + - parallel: + - name: Lint code + run: npm run lint:ultracite - - name: Lint tasks - run: npm run lint:tasks + - name: Lint tasks + run: npm run lint:tasks - - name: Lint schema - run: npm run lint:schema + - name: Lint schema + run: npm run lint:schema - - name: Lint UUIDs - run: npm run lint:uuids + - name: Lint UUIDs + run: npm run lint:uuids lint-links: name: Link Links diff --git a/.github/workflows/push-task-list-changes.yml b/.github/workflows/push-task-list-changes.yml index d0bac88..4c633b8 100644 --- a/.github/workflows/push-task-list-changes.yml +++ b/.github/workflows/push-task-list-changes.yml @@ -8,7 +8,7 @@ on: jobs: plugin: - runs-on: ubuntu-latest + runs-on: ubuntu-slim steps: - name: Checkout repository @@ -37,7 +37,7 @@ jobs: token: ${{ secrets.ROBOT_GITHUB_TOKEN }} taskapp: - runs-on: ubuntu-latest + runs-on: ubuntu-slim steps: - name: Checkout repository diff --git a/package.json b/package.json index 3c0f8c4..d3aa988 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "scripts": { - "format:ultracite": "ultracite format", + "format:ultracite": "ultracite fix", "format:tasks": "tsx bin/frac.mts tiers/*.json", "format": "npm run format:ultracite && npm run format:tasks", - "lint:ultracite": "ultracite lint", + "lint:ultracite": "ultracite check", "lint:tasks": "tsx bin/frac.mts --lint tiers/*.json", "lint:schema": "tsx bin/validate-schema.mts", "lint:uuids": "tsx bin/validate-uuids.mts",