From 4d9a0192a9225d0f2720b0b5d9fd4c70a9c17eea Mon Sep 17 00:00:00 2001 From: David Apirian Date: Tue, 1 Oct 2024 10:49:18 -0700 Subject: [PATCH] Use default runners, disable schedule by default (#119965) --- .config/mq.toml | 2 +- .github/workflows/factory.yaml | 7 ++++--- .github/workflows/housekeeping.yaml | 6 +++--- .github/workflows/pr.yaml | 3 +-- .github/workflows/pr_targets.yaml | 4 +--- .github/workflows/release.yaml | 2 +- .trunk/trunk.yaml | 6 +++--- README.md | 2 ++ 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.config/mq.toml b/.config/mq.toml index 237926af52a2..839d9e975d1f 100644 --- a/.config/mq.toml +++ b/.config/mq.toml @@ -16,7 +16,7 @@ sleep_for = "10m" [pullrequest] labels = "bot-pr" # label to apply to pull request on creation (comma separated list) comment = "" -requests_per_hour = 20 # target number of pull requests per hour +requests_per_hour = 20 # target number of pull requests per hour run_generate_for = "30 minutes" # the max number of deps in this repo. setting to 3 for example will cause diff --git a/.github/workflows/factory.yaml b/.github/workflows/factory.yaml index 40c01c9f38ca..95df8b85cc90 100644 --- a/.github/workflows/factory.yaml +++ b/.github/workflows/factory.yaml @@ -2,13 +2,14 @@ name: PR Factory on: workflow_dispatch: {} - schedule: - - cron: "0/30 * * * *" +# Uncomment the following cron schedule to run this workflow every 30 minutes +# schedule: +# - cron: 0/30 * * * * jobs: create-pr: # needs: merge-pr - runs-on: [ubicloud] + runs-on: ubuntu-latest steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/.github/workflows/housekeeping.yaml b/.github/workflows/housekeeping.yaml index be68432ab96f..374b9d78e63f 100644 --- a/.github/workflows/housekeeping.yaml +++ b/.github/workflows/housekeeping.yaml @@ -5,7 +5,7 @@ on: jobs: housekeeping: name: Cleanup old branches - runs-on: ubicloud + runs-on: ubuntu-latest steps: - name: Checkout repository uses: actions/checkout@v4 @@ -13,10 +13,10 @@ jobs: uses: beatlabs/delete-old-branches-action@v0.0.10 with: repo_token: ${{ github.token }} - date: "1 day ago" + date: 1 day ago dry_run: false delete_tags: true minimum_tags: 5 extra_protected_branch_regex: ^(main)$ - extra_protected_tag_regex: "^v.*" + extra_protected_tag_regex: ^v.* exclude_open_pr_branches: true diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index b3efdd954f7f..0fa3fd5afa09 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -1,4 +1,3 @@ -# trunk-ignore-all(semgrep/yaml.github-actions.security.third-party-action-not-pinned-to-commit-sha.third-party-action-not-pinned-to-commit-sha) name: PR Testing run-name: PR Checks for ${{ github.ref_name }} on: @@ -10,7 +9,7 @@ on: jobs: test: name: run tests to validate pr - runs-on: ubicloud + runs-on: ubuntu-latest env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} diff --git a/.github/workflows/pr_targets.yaml b/.github/workflows/pr_targets.yaml index 3dc12da976dc..be51a7c8fb07 100644 --- a/.github/workflows/pr_targets.yaml +++ b/.github/workflows/pr_targets.yaml @@ -1,5 +1,3 @@ -# trunk-ignore-all(semgrep/yaml.github-actions.security.third-party-action-not-pinned-to-commit-sha.third-party-action-not-pinned-to-commit-sha) - name: Upload Impacted Targets run-name: pr targets for ${{ github.ref_name }} on: pull_request @@ -7,7 +5,7 @@ on: pull_request jobs: compute_pr_targets: name: compute - runs-on: ubicloud + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a22f54147cf2..2ad8cc24e695 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -42,7 +42,7 @@ jobs: tag_and_release: name: Tag and Release [ ${{ github.event.inputs.release_tag }} ] - runs-on: [ubicloud] + runs-on: ubuntu-latest needs: [build] steps: diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 8cf3bc83ee39..d77e9204fd17 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -1,14 +1,14 @@ version: 0.1 cli: - version: 1.21.0 + version: 1.22.6 plugins: sources: - id: trunk - ref: v1.4.5 + ref: v1.6.3 uri: https://github.com/trunk-io/plugins - id: configs uri: https://github.com/trunk-io/configs - ref: v1.0.4 + ref: v1.0.8 runtimes: enabled: - node@18.12.1 diff --git a/README.md b/README.md index 78cf62c33e1c..0fd2fc997f3a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ + + ![light-complex (3)](https://github.com/trunk-io/mergequeue/assets/1265982/ded3489b-eef7-482f-b94f-0d944c1d93ce) ### Welcome