diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 27507171..dc09aad9 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,40 +1,43 @@ -# Pull request template + - +## Description -## Type of changes + - +## Motivation and Context -- [ ] CI -- [ ] Bugfix -- [ ] Feature -- [ ] Generic maintenance tasks -- [ ] Documentation content changes -- [ ] Code style update (formatting, renaming) -- [ ] Refactoring (no functional changes, no URL changes) -- [ ] Improving the performance of the project (not introducing new features) -- [ ] Other (please describe): + + -Issue Number: N/A +## How Has This Been Tested? -## What is the current behavior? + + + - +## Screenshots (if appropriate): -## What is the new behavior? +## Types of changes - + -### Does this introduce a breaking change? +- [ ] Bug fix (non-breaking change which fixes an issue) +- [ ] New feature (non-breaking change which adds functionality) +- [ ] Breaking change (fix or feature that would cause existing functionality to change) +- [ ] Documentation update (if none of the other choices apply) +- [ ] Chore (general maintenance, refactoring, or code style update) -- [ ] Yes -- [ ] No +## Checklist: - + + -## Other information +- [ ] My code follows the code style of this project. +- [ ] I have read the **CONTRIBUTING** document. +- [ ] I have added tests to cover my changes. +- [ ] All new and existing tests passed. +- [ ] I have updated the documentation accordingly. - +## Other information (if applicable) -N/A + diff --git a/.github/workflows/assign.yml b/.github/workflows/assign.yml deleted file mode 100644 index 76a92ab2..00000000 --- a/.github/workflows/assign.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -name: "❇️ Assign" - -on: - issues: - types: - - opened - pull_request: - types: - - labeled - -jobs: - assign: - runs-on: ubuntu-latest - steps: - - uses: actions/add-to-project@main - with: - project-url: https://github.com/orgs/z-shell/projects/4 - github-token: ${{ secrets.GITHUB_TOKEN }} - labeled: bug 🐞, triage 📑, annex 🌀, plugin ⚙️, package 📦, feature-request 💡 - label-operator: OR diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index c261e02d..24151b81 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -11,7 +11,7 @@ jobs: triage: runs-on: ubuntu-latest steps: - - uses: actions/labeler@v4 + - uses: actions/labeler@v5 with: repo-token: "${{ secrets.GITHUB_TOKEN }}" sync-labels: false diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml deleted file mode 100644 index c9881679..00000000 --- a/.github/workflows/sync-labels.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: "♻️ Sync Labels" -on: - schedule: - - cron: "22 2 * * 2" - workflow_dispatch: -jobs: - labels: - name: "♻️ Sync labels" - uses: z-shell/.github/.github/workflows/sync-labels.yml@main diff --git a/.github/workflows/trunk-check.yml b/.github/workflows/trunk-check.yml index 3c59a0bb..4bf797d1 100644 --- a/.github/workflows/trunk-check.yml +++ b/.github/workflows/trunk-check.yml @@ -1,23 +1,27 @@ --- -name: "⭕ Trunk" +name: Trunk Code Quality on: push: branches: [main] tags: ["v*.*.*"] pull_request: types: [opened, synchronize] - schedule: - - cron: "0 05 * * 5" workflow_dispatch: {} +concurrency: + group: ${{ github.head_ref || github.run_id }} + cancel-in-progress: true + +permissions: read-all + jobs: check: - if: github.event.schedule != '0 05 * * 5' - name: "⚡" - uses: z-shell/.github/.github/workflows/trunk.yml@main - upload: - if: github.event.schedule == '0 05 * * 5' - name: "🆙" - uses: z-shell/.github/.github/workflows/trunk.yml@main - secrets: - trunk-token: ${{ secrets.TRUNK_TOKEN }} + runs-on: ubuntu-latest + permissions: + checks: write # For trunk to post annotations + contents: read # For repo checkout + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Trunk Code Quality + uses: trunk-io/trunk-action@75699af9e26881e564e9d832ef7dc3af25ec031b diff --git a/.trunk/.gitignore b/.trunk/.gitignore index cf2f2547..15966d08 100644 --- a/.trunk/.gitignore +++ b/.trunk/.gitignore @@ -2,6 +2,8 @@ *logs *actions *notifications +*tools plugins user_trunk.yaml user.yaml +tmp diff --git a/.trunk/config/.markdownlint.yaml b/.trunk/config/.markdownlint.yaml index 465a9281..80110bca 100644 --- a/.trunk/config/.markdownlint.yaml +++ b/.trunk/config/.markdownlint.yaml @@ -9,3 +9,4 @@ spaces: false url: false whitespace: false MD041: false +MD026: false diff --git a/.trunk/config/.yamllint.yaml b/.trunk/config/.yamllint.yaml new file mode 100644 index 00000000..184e251f --- /dev/null +++ b/.trunk/config/.yamllint.yaml @@ -0,0 +1,7 @@ +rules: + quoted-strings: + required: only-when-needed + extra-allowed: ["{|}"] + key-duplicates: {} + octal-values: + forbid-implicit-octal: true diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index c08e045f..ac0395b4 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -1,23 +1,31 @@ version: 0.1 cli: - version: 1.1.0 + version: 1.24.0 plugins: sources: - id: trunk - ref: v0.0.6 + ref: v1.7.0 uri: https://github.com/trunk-io/plugins lint: + disabled: + - yamllint enabled: - - actionlint@1.6.22 - - svgo@3.0.2 - - gitleaks@8.15.1 - - markdownlint@0.32.2 + - checkov@3.2.441 + - oxipng@9.1.5 + - trufflehog@3.89.1 + - actionlint@1.7.7 + - svgo@3.3.2 + - gitleaks@8.27.2 + - markdownlint@0.45.0 - git-diff-check - - prettier@2.7.1 + - prettier@3.5.3 + - shellcheck@0.10.0 + - shfmt@3.7.0 runtimes: enabled: - - go@1.18.3 - - node@16.14.2 + - python@3.10.8 + - go@1.21.0 + - node@22.16.0 actions: enabled: - trunk-announce diff --git a/docs/images/logo.png b/docs/images/logo.png index 8ad25365..bfe2cfa8 100644 Binary files a/docs/images/logo.png and b/docs/images/logo.png differ diff --git a/docs/images/logo.svg b/docs/images/logo.svg index 01e6bedc..94482b14 100644 --- a/docs/images/logo.svg +++ b/docs/images/logo.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file