diff --git a/.github/workflows/repository-management.yml b/.github/workflows/repository-management.yml index ee9c010c687..c53e39105e3 100644 --- a/.github/workflows/repository-management.yml +++ b/.github/workflows/repository-management.yml @@ -449,12 +449,28 @@ jobs: - name: Commit version bumps with GPG signature if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }} run: | + TIMESTAMP=$(date +%Y%m%d-%H%M%S) + BRANCH_NAME="version-bump-${TIMESTAMP}" + echo "branch_name=$BRANCH_NAME" >> "$GITHUB_OUTPUT" + + - name: Create branch and commit version bump + if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }} + env: + BRANCH_NAME: ${{ steps.create-branch-name.outputs.branch_name }} + run: | + git checkout -b "$BRANCH_NAME" git commit -m "Bumped client version(s)" -a - name: Push changes to main if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }} run: | - git push + git push -u origin "$BRANCH_NAME" + gh pr create \ + --title "Bump client version(s)" \ + --body "Automated version bump created by repository-management workflow" \ + --label "version update" \ + --base main \ + --head "$BRANCH_NAME" cut_branch: name: Cut branch diff --git a/apps/browser/package.json b/apps/browser/package.json index 6a33e1bcef6..35b70b8a7ab 100644 --- a/apps/browser/package.json +++ b/apps/browser/package.json @@ -1,6 +1,6 @@ { "name": "@bitwarden/browser", - "version": "2026.4.0", + "version": "2026.5.0", "scripts": { "build": "npm run build:chrome", "build:bit": "npm run build:bit:chrome", diff --git a/apps/browser/src/manifest.json b/apps/browser/src/manifest.json index c1f678945a6..bcdbf76aef5 100644 --- a/apps/browser/src/manifest.json +++ b/apps/browser/src/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "__MSG_extName__", "short_name": "Bitwarden", - "version": "2026.4.0", + "version": "2026.5.0", "description": "__MSG_extDesc__", "default_locale": "en", "author": "Bitwarden Inc.", diff --git a/apps/browser/src/manifest.v3.json b/apps/browser/src/manifest.v3.json index 2231f09b743..f2928e0d5e4 100644 --- a/apps/browser/src/manifest.v3.json +++ b/apps/browser/src/manifest.v3.json @@ -3,7 +3,7 @@ "minimum_chrome_version": "102.0", "name": "__MSG_extName__", "short_name": "Bitwarden", - "version": "2026.4.0", + "version": "2026.5.0", "description": "__MSG_extDesc__", "default_locale": "en", "author": "Bitwarden Inc.", diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile index 96e973de889..361b0de7e04 100644 --- a/apps/web/Dockerfile +++ b/apps/web/Dockerfile @@ -33,7 +33,7 @@ RUN npm run ${NPM_COMMAND} ############################################### # Build stage 2 # ############################################### -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine3.21 AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0-alpine3.23 AS build # Docker buildx supplies the value for this arg ARG TARGETPLATFORM @@ -73,7 +73,7 @@ WORKDIR /app ############################################### # App stage # ############################################### -FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.21 +FROM mcr.microsoft.com/dotnet/aspnet:10.0-alpine3.23 ARG TARGETPLATFORM LABEL com.bitwarden.product="bitwarden" diff --git a/package-lock.json b/package-lock.json index ad0e9cb3342..9552c9fb0b7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -198,7 +198,7 @@ }, "apps/browser": { "name": "@bitwarden/browser", - "version": "2026.4.0" + "version": "2026.5.0" }, "apps/cli": { "name": "@bitwarden/cli",