Merge pull request #3877 from element-hq/release/v0.13

Release branch 0.13.0-rc.1

Author: sandhose

.github/workflows/build.yaml

@@ -2,7 +2,9 @@ name: Build
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - 'release/**'
     tags:
       - "v*"
 
@@ -259,9 +261,6 @@ jobs:
     name: Release syn2mas on NPM
     runs-on: ubuntu-latest
 
-    # Temporarily disabled
-    if: 'false'
-
     permissions:
       contents: read
       id-token: write

.github/workflows/ci.yaml

@@ -2,11 +2,12 @@ name: CI
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - 'release/**'
     tags:
       - 'v*'
   pull_request:
-    branches: [ main ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/release-branch.yaml

@@ -104,6 +104,11 @@ jobs:
             });
             console.log(`Created branch ${branch} from ${sha}`);
 
+      - name: Checkout the code
+        uses: actions/[email protected]
+        with:
+          ref: "release/v${{ needs.compute-version.outputs.short }}"
+
       - name: Open a pull request to merge the branch into main
         env:
           VERSION: ${{ needs.compute-version.outputs.short }}

.github/workflows/release-bump.yaml

@@ -44,7 +44,7 @@ jobs:
         env:
           BUMP: ${{ github.event.inputs.rc && 'prerelease' || 'patch' }}
           VERSION: ${{ steps.current.outputs.version }}
-        run: echo "version=$(npx --yes [email protected] -i "$BUMP"" --preid rc "$VERSION")" >> "$GITHUB_OUTPUT"
+        run: echo "version=$(npx --yes [email protected] -i "$BUMP" --preid rc "$VERSION")" >> "$GITHUB_OUTPUT"
 
   tag:
     uses: ./.github/workflows/tag.yaml
@@ -74,7 +74,7 @@ jobs:
             const [owner, repo] = process.env.GITHUB_REPOSITORY.split('/');
             const branch = process.env.BRANCH;
             const sha = process.env.SHA;
-            const ref = `refs/heads/${branch}`;
+            const ref = `heads/${branch}`;
 
             await github.rest.git.updateRef({
               owner,
@@ -84,6 +84,11 @@ jobs:
             });
             console.log(`Updated branch ${branch} to ${sha}`);
 
+      - name: Checkout the code
+        uses: actions/[email protected]
+        with:
+          ref: "${{ github.ref_name }}"
+
       - name: Open a pull request to merge the release branch back to main
         if: github.event.inputs.merge-back
         env:

Cargo.lock

@@ -4,7 +4,7 @@ members = ["crates/*"]
 resolver = "2"
 
 # Updated in the CI with a `sed` command
-package.version = "0.12.0"
+package.version = "0.13.0-rc.1"
 package.license = "AGPL-3.0-only"
 package.authors = ["Element Backend Team"]
 package.edition = "2021"
@@ -27,33 +27,33 @@ broken_intra_doc_links = "deny"
 [workspace.dependencies]
 
 # Workspace crates
-mas-axum-utils = { path = "./crates/axum-utils/", version = "=0.12.0" }
-mas-cli = { path = "./crates/cli/", version = "=0.12.0" }
-mas-config = { path = "./crates/config/", version = "=0.12.0" }
-mas-data-model = { path = "./crates/data-model/", version = "=0.12.0" }
-mas-email = { path = "./crates/email/", version = "=0.12.0" }
-mas-graphql = { path = "./crates/graphql/", version = "=0.12.0" }
-mas-handlers = { path = "./crates/handlers/", version = "=0.12.0" }
-mas-http = { path = "./crates/http/", version = "=0.12.0" }
-mas-i18n = { path = "./crates/i18n/", version = "=0.12.0" }
-mas-i18n-scan = { path = "./crates/i18n-scan/", version = "=0.12.0" }
-mas-iana = { path = "./crates/iana/", version = "=0.12.0" }
-mas-iana-codegen = { path = "./crates/iana-codegen/", version = "=0.12.0" }
-mas-jose = { path = "./crates/jose/", version = "=0.12.0" }
-mas-keystore = { path = "./crates/keystore/", version = "=0.12.0" }
-mas-listener = { path = "./crates/listener/", version = "=0.12.0" }
-mas-matrix = { path = "./crates/matrix/", version = "=0.12.0" }
-mas-matrix-synapse = { path = "./crates/matrix-synapse/", version = "=0.12.0" }
-mas-oidc-client = { path = "./crates/oidc-client/", version = "=0.12.0" }
-mas-policy = { path = "./crates/policy/", version = "=0.12.0" }
-mas-router = { path = "./crates/router/", version = "=0.12.0" }
-mas-spa = { path = "./crates/spa/", version = "=0.12.0" }
-mas-storage = { path = "./crates/storage/", version = "=0.12.0" }
-mas-storage-pg = { path = "./crates/storage-pg/", version = "=0.12.0" }
-mas-tasks = { path = "./crates/tasks/", version = "=0.12.0" }
-mas-templates = { path = "./crates/templates/", version = "=0.12.0" }
-mas-tower = { path = "./crates/tower/", version = "=0.12.0" }
-oauth2-types = { path = "./crates/oauth2-types/", version = "=0.12.0" }
+mas-axum-utils = { path = "./crates/axum-utils/", version = "=0.13.0-rc.1" }
+mas-cli = { path = "./crates/cli/", version = "=0.13.0-rc.1" }
+mas-config = { path = "./crates/config/", version = "=0.13.0-rc.1" }
+mas-data-model = { path = "./crates/data-model/", version = "=0.13.0-rc.1" }
+mas-email = { path = "./crates/email/", version = "=0.13.0-rc.1" }
+mas-graphql = { path = "./crates/graphql/", version = "=0.13.0-rc.1" }
+mas-handlers = { path = "./crates/handlers/", version = "=0.13.0-rc.1" }
+mas-http = { path = "./crates/http/", version = "=0.13.0-rc.1" }
+mas-i18n = { path = "./crates/i18n/", version = "=0.13.0-rc.1" }
+mas-i18n-scan = { path = "./crates/i18n-scan/", version = "=0.13.0-rc.1" }
+mas-iana = { path = "./crates/iana/", version = "=0.13.0-rc.1" }
+mas-iana-codegen = { path = "./crates/iana-codegen/", version = "=0.13.0-rc.1" }
+mas-jose = { path = "./crates/jose/", version = "=0.13.0-rc.1" }
+mas-keystore = { path = "./crates/keystore/", version = "=0.13.0-rc.1" }
+mas-listener = { path = "./crates/listener/", version = "=0.13.0-rc.1" }
+mas-matrix = { path = "./crates/matrix/", version = "=0.13.0-rc.1" }
+mas-matrix-synapse = { path = "./crates/matrix-synapse/", version = "=0.13.0-rc.1" }
+mas-oidc-client = { path = "./crates/oidc-client/", version = "=0.13.0-rc.1" }
+mas-policy = { path = "./crates/policy/", version = "=0.13.0-rc.1" }
+mas-router = { path = "./crates/router/", version = "=0.13.0-rc.1" }
+mas-spa = { path = "./crates/spa/", version = "=0.13.0-rc.1" }
+mas-storage = { path = "./crates/storage/", version = "=0.13.0-rc.1" }
+mas-storage-pg = { path = "./crates/storage-pg/", version = "=0.13.0-rc.1" }
+mas-tasks = { path = "./crates/tasks/", version = "=0.13.0-rc.1" }
+mas-templates = { path = "./crates/templates/", version = "=0.13.0-rc.1" }
+mas-tower = { path = "./crates/tower/", version = "=0.13.0-rc.1" }
+oauth2-types = { path = "./crates/oauth2-types/", version = "=0.13.0-rc.1" }
 
 # OpenAPI schema generation and validation
 [workspace.dependencies.aide]