Merge branch 'main' into 2.x

Author: bitbrain

.github/workflows/build-branch.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   test:
-    if: github.ref != 'refs/heads/main'
+    if: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/2.x' }}
     runs-on: ubuntu-latest
     strategy:
       matrix:

.github/workflows/release-gem.yml

@@ -4,7 +4,7 @@ on: [push]
 
 jobs:
   release:
-    if: github.ref == 'refs/heads/main'
+    if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/2.x' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1