Merge branch 'master' into auto-update/renku-ui-3.20.1

SwissDataScienceCenter · Feb 9, 2024 · dee7095 · dee7095
2 parents 16a1a51 + 4f0ea8c
commit dee7095
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/create-release-branch.yml b/.github/workflows/create-release-branch.yml
@@ -44,7 +44,7 @@ jobs:
       - name: Create Pull Request
         uses: actions/github-script@v7
         with:
-          token: ${{ secrets.RENKUBOT_GITHUB_TOKEN }}
+          github-token: ${{ secrets.RENKUBOT_GITHUB_TOKEN }}
           script: |
             const { repo, owner } = context.repo;
             const result = await github.rest.pulls.create({
@@ -54,9 +54,11 @@ jobs:
               head: 'release-${{ github.event.inputs.version }}',
               base: '${{ github.event.inputs.target_branch }}',
               body: [
+                'Release ${{ github.event.inputs.version }}',
+                '',
+                'This PR is auto-generated by [actions/github-script](https://github.com/actions/github-script).',
+                '',
                 '/deploy ',
-                'This PR is auto-generated by',
-                '[actions/github-script](https://github.com/actions/github-script).'
               ].join('\n')
             });
             github.rest.issues.addLabels({

diff --git a/RELEASE.md b/RELEASE.md
@@ -12,8 +12,9 @@ This procedure should be followed for *any* release:
 
 * Create a release branch (e.g. `0.46.x`), if one does not already exist, with the [release action](https://github.com/SwissDataScienceCenter/renku/actions/workflows/create-release-branch.yml).
 * Create a `CHANGELOG` entry for the release and open a PR; create a deployment, this is the reference for the release.
-* Note that any PR that should go into the release needs to target the release branch _not_ `master`. 
+* Note that any PR that should go into the release needs to target the release branch _not_ `master`.
 * All release branches should be protected.
+* Use the "Rebase and Merge" button to merge release branches into `master`; do not squash commits.
 
 Acceptance tests have to pass on all release branches before merging. 
 

diff --git a/acceptance-tests/build.sbt b/acceptance-tests/build.sbt
@@ -40,7 +40,7 @@ libraryDependencies += "io.circe"               %% "circe-optics"
 libraryDependencies += "org.http4s"             %% "http4s-blaze-client"           % "0.23.16"    % Test
 libraryDependencies += "org.http4s"             %% "http4s-circe"                  % "0.23.25"    % Test
 libraryDependencies += "org.scalacheck"         %% "scalacheck"                    % "1.17.0"     % Test
-libraryDependencies += "org.scalatest"          %% "scalatest"                     % "3.2.17"     % Test
+libraryDependencies += "org.scalatest"          %% "scalatest"                     % "3.2.18"     % Test
 libraryDependencies += "org.scalatestplus"      %% "selenium-4-1"                  % "3.2.12.1"   % Test
 libraryDependencies += "org.seleniumhq.selenium" % "selenium-http-jdk-client"      % "4.13.0"     % Test
 libraryDependencies += "org.seleniumhq.selenium" % "selenium-java"                 % "4.17.0"     % Test