From dd81e1e3345b91c4cb4653b697c1054526f6b924 Mon Sep 17 00:00:00 2001 From: dundargoc Date: Sun, 12 Nov 2023 21:40:24 +0100 Subject: [PATCH] ci: refactor CI files Mostly rename file and variable names to be more consistent. This makes it easier to locate them in the "Actions" tab on github. --- .github/scripts/{reviews.js => reviewers_add.js} | 0 .../scripts/{remove-reviewers.js => reviewers_remove.js} | 0 .github/workflows/backport.yml | 2 +- .github/workflows/codeql.yml | 2 +- .github/workflows/coverity.yml | 2 +- .github/workflows/{api-docs.yml => docs.yml} | 6 ++---- .../workflows/{issue-open-check.yml => labeler_issue.yml} | 7 ++----- .github/workflows/{labeler.yml => labeler_pr.yml} | 6 +++--- .github/workflows/lintcommit.yml | 2 +- .github/workflows/news.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/{add-reviewers.yml => reviewers_add.yml} | 4 ++-- .../{remove-reviewers.yml => reviewers_remove.yml} | 4 ++-- .github/workflows/test.yml | 4 ++-- .github/workflows/{vim-patches.yml => vim_patches.yml} | 0 15 files changed, 19 insertions(+), 24 deletions(-) rename .github/scripts/{reviews.js => reviewers_add.js} (100%) rename .github/scripts/{remove-reviewers.js => reviewers_remove.js} (100%) rename .github/workflows/{api-docs.yml => docs.yml} (87%) rename .github/workflows/{issue-open-check.yml => labeler_issue.yml} (92%) rename .github/workflows/{labeler.yml => labeler_pr.yml} (93%) rename .github/workflows/{add-reviewers.yml => reviewers_add.yml} (83%) rename .github/workflows/{remove-reviewers.yml => reviewers_remove.yml} (77%) rename .github/workflows/{vim-patches.yml => vim_patches.yml} (100%) diff --git a/.github/scripts/reviews.js b/.github/scripts/reviewers_add.js similarity index 100% rename from .github/scripts/reviews.js rename to .github/scripts/reviewers_add.js diff --git a/.github/scripts/remove-reviewers.js b/.github/scripts/reviewers_remove.js similarity index 100% rename from .github/scripts/remove-reviewers.js rename to .github/scripts/reviewers_remove.js diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 321cd02b0c..3ed5573262 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -1,4 +1,4 @@ -name: Backport +name: backport on: pull_request_target: types: [closed, labeled] diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 033dd5aef4..75c932b0a6 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -1,4 +1,4 @@ -name: "CodeQL" +name: "codeql" concurrency: group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }} diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index 998678daf0..db0f878de4 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -1,4 +1,4 @@ -name: Coverity +name: coverity on: schedule: - cron: '10 0 * * *' # Run every day at 00:10 diff --git a/.github/workflows/api-docs.yml b/.github/workflows/docs.yml similarity index 87% rename from .github/workflows/api-docs.yml rename to .github/workflows/docs.yml index 181e3a1a41..c47df46b28 100644 --- a/.github/workflows/api-docs.yml +++ b/.github/workflows/docs.yml @@ -1,5 +1,4 @@ -# Check if any PR needs to run the autogenerate script -name: Autogenerate API docs and types +name: docs on: pull_request: types: [opened, synchronize, reopened, ready_for_review] @@ -8,9 +7,8 @@ on: - 'src/nvim/eval.lua' - 'runtime/lua/**.lua' - 'runtime/doc/**' - jobs: - regen-api-docs-and-types: + docs: runs-on: ubuntu-latest if: github.event.pull_request.draft == false permissions: diff --git a/.github/workflows/issue-open-check.yml b/.github/workflows/labeler_issue.yml similarity index 92% rename from .github/workflows/issue-open-check.yml rename to .github/workflows/labeler_issue.yml index eac1c2ee4d..0da4c0f707 100644 --- a/.github/workflows/issue-open-check.yml +++ b/.github/workflows/labeler_issue.yml @@ -1,17 +1,14 @@ -name: Issue Open Check - +name: "labeler: issue" on: issues: types: [opened] - jobs: - issue-open-check: + labeler: permissions: issues: write runs-on: ubuntu-latest steps: - name: check issue title - id: check-issue uses: actions/github-script@v7 with: script: | diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler_pr.yml similarity index 93% rename from .github/workflows/labeler.yml rename to .github/workflows/labeler_pr.yml index cd4bd660aa..7f2514069e 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler_pr.yml @@ -1,9 +1,9 @@ -name: "Pull Request Labeler" +name: "labeler: PR" on: pull_request_target: types: [opened] jobs: - triage: + labeler: runs-on: ubuntu-latest permissions: contents: read @@ -37,4 +37,4 @@ jobs: needs: ["triage", "type-scope"] permissions: pull-requests: write - uses: ./.github/workflows/add-reviewers.yml + uses: ./.github/workflows/reviewers_add.yml diff --git a/.github/workflows/lintcommit.yml b/.github/workflows/lintcommit.yml index f27b22f35f..3d140532cd 100644 --- a/.github/workflows/lintcommit.yml +++ b/.github/workflows/lintcommit.yml @@ -1,4 +1,4 @@ -name: "Commit Linter" +name: "lintcommit" on: pull_request: types: [opened, synchronize, reopened, ready_for_review] diff --git a/.github/workflows/news.yml b/.github/workflows/news.yml index d4f8e5ad65..09337a0356 100644 --- a/.github/workflows/news.yml +++ b/.github/workflows/news.yml @@ -1,4 +1,4 @@ -name: "news.txt check" +name: "news.txt" on: pull_request: types: [opened, synchronize, reopened, ready_for_review] diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e304196e99..feacb29533 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -name: Release +name: release on: schedule: - cron: '5 5 * * *' diff --git a/.github/workflows/add-reviewers.yml b/.github/workflows/reviewers_add.yml similarity index 83% rename from .github/workflows/add-reviewers.yml rename to .github/workflows/reviewers_add.yml index 22c68b6ef7..b116bca29b 100644 --- a/.github/workflows/add-reviewers.yml +++ b/.github/workflows/reviewers_add.yml @@ -1,4 +1,4 @@ -name: "Request reviews" +name: "reviewers: add" on: pull_request_target: types: [labeled, ready_for_review, reopened] @@ -15,5 +15,5 @@ jobs: uses: actions/github-script@v7 with: script: | - const script = require('./.github/scripts/reviews.js') + const script = require('./.github/scripts/reviewers_add.js') await script({github, context}) diff --git a/.github/workflows/remove-reviewers.yml b/.github/workflows/reviewers_remove.yml similarity index 77% rename from .github/workflows/remove-reviewers.yml rename to .github/workflows/reviewers_remove.yml index 3fe7493b93..b10d8c3d23 100644 --- a/.github/workflows/remove-reviewers.yml +++ b/.github/workflows/reviewers_remove.yml @@ -1,4 +1,4 @@ -name: "Remove reviewers" +name: "reviewers: remove" on: pull_request_target: types: [converted_to_draft, closed] @@ -13,5 +13,5 @@ jobs: uses: actions/github-script@v7 with: script: | - const script = require('./.github/scripts/remove-reviewers.js') + const script = require('./.github/scripts/reviewers_remove.js') await script({github, context}) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 941393497a..43fd76dd39 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -104,14 +104,14 @@ jobs: { runner: ubuntu-22.04, flavor: tsan, cc: clang, flags: -D ENABLE_TSAN=ON }, { runner: ubuntu-22.04, cc: gcc }, { runner: macos-12, cc: clang, flags: -D CMAKE_FIND_FRAMEWORK=NEVER, deps_flags: -D CMAKE_FIND_FRAMEWORK=NEVER }, - { runner: ubuntu-22.04, flavor: functionaltest-lua, cc: gcc, deps_flags: -D USE_BUNDLED_LUAJIT=OFF -D USE_BUNDLED_LUA=ON, flags: -D PREFER_LUA=ON }, + { runner: ubuntu-22.04, flavor: puc-lua, cc: gcc, deps_flags: -D USE_BUNDLED_LUAJIT=OFF -D USE_BUNDLED_LUA=ON, flags: -D PREFER_LUA=ON }, ] test: [unittest, functionaltest, oldtest] exclude: - test: unittest build: { flavor: tsan } - test: unittest - build: { flavor: functionaltest-lua } + build: { flavor: puc-lua } - test: oldtest build: { flavor: tsan } runs-on: ${{ matrix.build.runner }} diff --git a/.github/workflows/vim-patches.yml b/.github/workflows/vim_patches.yml similarity index 100% rename from .github/workflows/vim-patches.yml rename to .github/workflows/vim_patches.yml