From bdc0588f7d6345841c9fc8f2edd8a74dd4985f6f Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Wed, 7 Feb 2024 14:07:49 +0100 Subject: [PATCH 1/8] chore(ci/cd): minor fixes to the release action (#3466) --- .github/workflows/create-release-branch.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/create-release-branch.yml b/.github/workflows/create-release-branch.yml index 3817e80d39..45e15469c2 100644 --- 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({ From 4a7cc2cfc78bc0ffafa6ea9e094674664f02fba2 Mon Sep 17 00:00:00 2001 From: Lorenzo Date: Wed, 7 Feb 2024 09:40:55 +0100 Subject: [PATCH 2/8] chore: update release instructions --- RELEASE.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index e552b2ef0f..08b6caeee1 100644 --- 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. From 4f0ea8c2d8e8b3f02680040ed6d5a885acaa7c46 Mon Sep 17 00:00:00 2001 From: RenkuBot <53332360+RenkuBot@users.noreply.github.com> Date: Thu, 8 Feb 2024 09:23:11 +0100 Subject: [PATCH 3/8] chore: Update scalatest from 3.2.17 to 3.2.18 (#3482) Co-authored-by: RenkuBot --- acceptance-tests/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acceptance-tests/build.sbt b/acceptance-tests/build.sbt index 27fe293ace..a3d00290a8 100644 --- 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 From 6d9eafaf8a7c18ebc9b93b3a20fd920edd561c3b Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Fri, 9 Feb 2024 11:30:24 +0100 Subject: [PATCH 4/8] chore: updating renku-ui version to 3.20.1 --- helm-chart/renku/values.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/helm-chart/renku/values.yaml b/helm-chart/renku/values.yaml index 910d81c5dd..d1bcc1131a 100644 --- a/helm-chart/renku/values.yaml +++ b/helm-chart/renku/values.yaml @@ -613,7 +613,7 @@ ui: replicaCount: 1 image: repository: renku/renku-ui - tag: "3.20.0" + tag: "3.20.1" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -773,7 +773,7 @@ ui: keepCookies: [] image: repository: renku/renku-ui-server - tag: "3.20.0" + tag: "3.20.1" pullPolicy: IfNotPresent imagePullSecrets: [] nameOverride: "" @@ -855,7 +855,8 @@ dlf-chart: enabled: false dataset-operator-chart: enabled: true -csi-rclone: {} +csi-rclone: + {} # This section is only relevant if you are installing csi-rclone as part of Renku ## Name of the csi storage class to use for RClone/Cloudstorage. Should be unique per cluster. # storageClassName: csi-rclone From 96b9e189deefb32159a6f18e7a65547a58dd83c4 Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Fri, 9 Feb 2024 11:32:02 +0100 Subject: [PATCH 5/8] undo minor change --- helm-chart/renku/values.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/helm-chart/renku/values.yaml b/helm-chart/renku/values.yaml index d1bcc1131a..f5f5e750b1 100644 --- a/helm-chart/renku/values.yaml +++ b/helm-chart/renku/values.yaml @@ -855,8 +855,7 @@ dlf-chart: enabled: false dataset-operator-chart: enabled: true -csi-rclone: - {} +csi-rclone: {} # This section is only relevant if you are installing csi-rclone as part of Renku ## Name of the csi storage class to use for RClone/Cloudstorage. Should be unique per cluster. # storageClassName: csi-rclone From 168e48b281b406e696a2b70f2bf635e623fb149e Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Fri, 9 Feb 2024 11:36:37 +0100 Subject: [PATCH 6/8] update changelog --- CHANGELOG.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index eaa81982f6..1a261b69d0 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -24,6 +24,9 @@ User-Facing Changes (`#3014 `_). - **UI**: Hide button to add storage on deployments not supporting external storages (`#3001 `_). +- **UI**: Fix landing page parallax background (`#3010 `_). +- **UI**: Fix search bar styles (`#3019 `_). +- **UI**: Handle jsonrpc improper redirects (`#3017 `_, `#2966 `_). Internal Changes ~~~~~~~~~~~~~~~~ @@ -36,6 +39,7 @@ Internal Changes Individual components ~~~~~~~~~~~~~~~~~~~~~~ +- `renku-ui 3.20.1 `_ - `renku-ui 3.20.0 `_ From 16a1a51633675571042d4f2807977de23ef4f060 Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Fri, 9 Feb 2024 13:06:11 +0100 Subject: [PATCH 7/8] spelling? --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1a261b69d0..bfe0462263 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -26,7 +26,7 @@ User-Facing Changes (`#3001 `_). - **UI**: Fix landing page parallax background (`#3010 `_). - **UI**: Fix search bar styles (`#3019 `_). -- **UI**: Handle jsonrpc improper redirects (`#3017 `_, `#2966 `_). +- **UI**: Handle ``jsonrpc`` improper redirects (`#3017 `_, `#2966 `_). Internal Changes ~~~~~~~~~~~~~~~~ From 52e55441d2017c1d7a8d3bcbf414d987a7734b9c Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Fri, 9 Feb 2024 15:52:40 +0100 Subject: [PATCH 8/8] undo merge origin/master --- .github/workflows/create-release-branch.yml | 8 +++----- RELEASE.md | 3 +-- acceptance-tests/build.sbt | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/create-release-branch.yml b/.github/workflows/create-release-branch.yml index 45e15469c2..3817e80d39 100644 --- 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: - github-token: ${{ secrets.RENKUBOT_GITHUB_TOKEN }} + token: ${{ secrets.RENKUBOT_GITHUB_TOKEN }} script: | const { repo, owner } = context.repo; const result = await github.rest.pulls.create({ @@ -54,11 +54,9 @@ 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 index 08b6caeee1..e552b2ef0f 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -12,9 +12,8 @@ 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 index a3d00290a8..27fe293ace 100644 --- 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.18" % Test +libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.17" % 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