Merge #22

22: Fix release r=JoelWachsler a=JoelWachsler



Co-authored-by: Joel Wachsler <JoelWachsler@users.noreply.github.com>

.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

.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

.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' }}

.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/')"
 
@@ -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 }}"
-          branch: main
+          base: main
+          branch: create_release/${{ steps.vars.outputs.result }}
           delete-branch: true

bors.toml

@@ -2,5 +2,13 @@ delete_merged_branches = true
 update_base_for_deletes = true
 
 status = [
-  "test"
+  "test",
+  "fmt",
+  "clippy",
+]
+
+pr_status = [
+  "test",
+  "fmt",
+  "clippy",
 ]