From 0c255ab302f4cde52ac35fa4f11c78524a3ef8de Mon Sep 17 00:00:00 2001 From: Joel Wachsler Date: Mon, 11 Jul 2022 15:07:40 +0000 Subject: [PATCH 1/7] Go back to 22.04 --- .github/workflows/ci.yml | 6 +++--- .github/workflows/extra.yml | 2 +- .github/workflows/publish.yml | 4 ++-- .github/workflows/release.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 730fe41..f31f203 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ env: jobs: test: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 services: # Needed for tests to pass @@ -48,7 +48,7 @@ jobs: args: --workspace --verbose fmt: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 @@ -67,7 +67,7 @@ jobs: args: --all -- --check clippy: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml index 1c99e6f..faed958 100644 --- a/.github/workflows/extra.yml +++ b/.github/workflows/extra.yml @@ -12,7 +12,7 @@ jobs: # Need to have the same name as where this dependency is used, # otherwise the cache key won't be the same. release: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: # build and cache this here in order to reuse it's cache in feature branches diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1aae0b0..d4b287c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,7 +10,7 @@ env: jobs: tag: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: should_publish: ${{ steps.create-and-push-tag.outputs.should_publish }} @@ -39,7 +39,7 @@ jobs: echo "The result is: ${{ steps.create-and-push-tag.outputs.should_publish }}" publish: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: tag if: ${{ needs.tag.outputs.should_publish == 'true' }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 81be97b..5b39eb6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ env: jobs: release: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: "startsWith(github.ref, 'refs/heads/create_release/')" From 0906c011655b7d1e6158923103e93d12c0a416b2 Mon Sep 17 00:00:00 2001 From: Joel Wachsler Date: Mon, 11 Jul 2022 15:10:26 +0000 Subject: [PATCH 2/7] Debug --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5b39eb6..05835d5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,5 +51,5 @@ jobs: title: "Create release ${{ steps.vars.outputs.result }}" commit-message: "Create release ${{ steps.vars.outputs.result }}" body: "Create release ${{ steps.vars.outputs.result }}" - branch: main + base: main delete-branch: true From 61a49cd8de5c32a4699dc86b3474e0e76b94ae29 Mon Sep 17 00:00:00 2001 From: Joel Wachsler Date: Mon, 11 Jul 2022 15:13:03 +0000 Subject: [PATCH 3/7] Debug --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 05835d5..ab8f7c7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -52,4 +52,5 @@ jobs: commit-message: "Create release ${{ steps.vars.outputs.result }}" body: "Create release ${{ steps.vars.outputs.result }}" base: main + branch: create_release/${{ steps.vars.outputs.result }} delete-branch: true From 54b41dc310fab59907430895e89b2f9b8012f577 Mon Sep 17 00:00:00 2001 From: Joel Wachsler Date: Mon, 11 Jul 2022 15:17:00 +0000 Subject: [PATCH 4/7] Debug --- .github/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ab8f7c7..a3930b8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,6 +51,5 @@ jobs: title: "Create release ${{ steps.vars.outputs.result }}" commit-message: "Create release ${{ steps.vars.outputs.result }}" body: "Create release ${{ steps.vars.outputs.result }}" - base: main branch: create_release/${{ steps.vars.outputs.result }} delete-branch: true From 7cd98141778088e12bebffda2faba908325270f1 Mon Sep 17 00:00:00 2001 From: Joel Wachsler Date: Mon, 11 Jul 2022 15:19:15 +0000 Subject: [PATCH 5/7] Re-add base --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a3930b8..ab8f7c7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,5 +51,6 @@ jobs: title: "Create release ${{ steps.vars.outputs.result }}" commit-message: "Create release ${{ steps.vars.outputs.result }}" body: "Create release ${{ steps.vars.outputs.result }}" + base: main branch: create_release/${{ steps.vars.outputs.result }} delete-branch: true From 7d05cf3ff250900d69479d4e94e50ff45a81144a Mon Sep 17 00:00:00 2001 From: Joel Wachsler Date: Mon, 11 Jul 2022 15:26:15 +0000 Subject: [PATCH 6/7] Add more statuses --- bors.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bors.toml b/bors.toml index 81bcfd1..843d034 100644 --- a/bors.toml +++ b/bors.toml @@ -2,5 +2,7 @@ delete_merged_branches = true update_base_for_deletes = true status = [ - "test" + "test", + "fmt", + "clippy", ] From 310ef9ef1ebd3f17a33c902a55ffbf6c0efe40f7 Mon Sep 17 00:00:00 2001 From: Joel Wachsler Date: Mon, 11 Jul 2022 15:27:20 +0000 Subject: [PATCH 7/7] Also check pr_status --- bors.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bors.toml b/bors.toml index 843d034..f2ba509 100644 --- a/bors.toml +++ b/bors.toml @@ -6,3 +6,9 @@ status = [ "fmt", "clippy", ] + +pr_status = [ + "test", + "fmt", + "clippy", +]