Skip to content

Commit d1a15fd

Browse files
lorenzo-cavazzilorenzo-cavazzi
authored
Merge branch 'main' into lorenzo/update-shutdown-session-warnings
2 parents 5823752 + 9454b5d commit d1a15fd

File tree

5 files changed

+575
-292
lines changed

5 files changed

+575
-292
lines changed

‎.github/workflows/acceptance-tests.yml

Lines changed: 73 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,20 @@ on:
88
types:
99
- opened
1010
- edited
11-
- synchronize
12-
- reopened
1311
- closed
14-
paths:
15-
- client/**
16-
- helm-chart/**
17-
- tests/**
18-
- server/**
19-
- .github/workflows/**
20-
- chartpress.yaml
12+
- reopened
13+
- synchronize
2114

2215
concurrency:
23-
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
16+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref || github.run_id }}
2417
cancel-in-progress: true
2518

2619
jobs:
2720
check-deploy:
2821
name: Analyze deploy string
2922
runs-on: ubuntu-24.04
3023
outputs:
31-
pr-contains-string: ${{ steps.deploy-comment.outputs.pr-contains-string }}
24+
deploy: ${{ steps.deploy-comment.outputs.pr-contains-string }}
3225
renku: ${{ steps.deploy-comment.outputs.renku}}
3326
renku-core: ${{ steps.deploy-comment.outputs.renku-core}}
3427
renku-gateway: ${{ steps.deploy-comment.outputs.renku-gateway}}
@@ -41,8 +34,9 @@ jobs:
4134
test-legacy-enabled: ${{ steps.deploy-comment.outputs.test-legacy-enabled}}
4235
extra-values: ${{ steps.deploy-comment.outputs.extra-values}}
4336
steps:
44-
- id: deploy-comment
45-
uses: SwissDataScienceCenter/renku-actions/check-pr-description@v1.18.2
37+
- name: Check PR description
38+
id: deploy-comment
39+
uses: SwissDataScienceCenter/renku-actions/check-pr-description@v1.19.0
4640
with:
4741
pr_ref: ${{ github.event.number }}
4842

@@ -52,23 +46,28 @@ jobs:
5246
needs: [check-deploy]
5347
permissions:
5448
pull-requests: write
55-
if: github.event.action != 'closed' && needs.check-deploy.outputs.pr-contains-string == 'true'
56-
environment:
57-
name: renku-ci-ui-${{ github.event.number }}
58-
url: https://renku-ci-ui-${{ github.event.number }}.dev.renku.ch
49+
id-token: write
50+
if: github.event.action != 'closed' && needs.check-deploy.outputs.deploy == 'true'
51+
# NOTE: using GitHub deploy environments does not work with Azure at the moment
52+
# environment:
53+
# name: renku-ci-ui-${{ github.event.number }}
54+
# url: https://renku-ci-ui-${{ github.event.number }}.dev.renku.ch
5955
steps:
60-
- uses: actions/checkout@v4
56+
- name: Checkout renku repository
57+
uses: actions/checkout@v4
6158
with:
6259
repository: SwissDataScienceCenter/renku
6360
sparse-checkout: |
6461
minimal-deployment
62+
6563
- name: Find deplyoment url
6664
uses: peter-evans/find-comment@v3
6765
id: deploymentUrlMessage
6866
with:
6967
issue-number: ${{ github.event.pull_request.number }}
7068
comment-author: "RenkuBot"
7169
body-includes: "You can access the deployment of this PR at"
70+
7271
- name: Create comment deployment url
7372
if: steps.deploymentUrlMessage.outputs.comment-id == 0
7473
uses: peter-evans/create-or-update-comment@v4
@@ -77,19 +76,40 @@ jobs:
7776
issue-number: ${{ github.event.pull_request.number }}
7877
body: |
7978
You can access the deployment of this PR at https://renku-ci-ui-${{ github.event.number }}.dev.renku.ch
79+
80+
- name: Azure login
81+
uses: azure/login@v2
82+
with:
83+
client-id: ${{ secrets.CI_RENKU_AZURE_CLIENT_ID }}
84+
tenant-id: ${{ secrets.CI_RENKU_AZURE_TENANT_ID }}
85+
subscription-id: ${{ secrets.CI_RENKU_AZURE_SUBSCRIPTION_ID }}
86+
87+
- name: Set AKS context
88+
uses: azure/aks-set-context@v4
89+
with:
90+
resource-group: "renku-dev"
91+
cluster-name: "aks-switzerlandnorth-renku-dev"
92+
93+
# See: https://github.com/orgs/community/discussions/168949
94+
# It is easier to have the kube config in {{ github.workspace }}.
95+
- name: Setup kubeconfig
96+
run: |
97+
mv "${KUBECONFIG}" "${{ github.workspace }}/renkubot-kube.config"
98+
export KUBECONFIG="${{ github.workspace }}/renkubot-kube.config"
99+
echo "KUBECONFIG=${KUBECONFIG}" >> "$GITHUB_ENV"
100+
80101
- name: Build and deploy
81-
uses: SwissDataScienceCenter/renku-actions/deploy-renku@v1.18.2
102+
uses: SwissDataScienceCenter/renku-actions/deploy-renku@v1.19.0
82103
env:
83104
DOCKER_PASSWORD: ${{ secrets.RENKU_DOCKER_PASSWORD }}
84105
DOCKER_USERNAME: ${{ secrets.RENKU_DOCKER_USERNAME }}
85106
GITLAB_TOKEN: ${{ secrets.DEV_GITLAB_TOKEN }}
86-
KUBECONFIG: ${{ github.workspace }}/renkubot-kube.config
87107
RENKU_RELEASE: renku-ci-ui-${{ github.event.number }}
88108
RENKU_VALUES_FILE: ${{ github.workspace }}/values.yaml
89109
RENKU_VALUES: minimal-deployment/minimal-deployment-values.yaml
90-
RENKUBOT_KUBECONFIG: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}
91-
RENKUBOT_RANCHER_BEARER_TOKEN: ${{ secrets.RENKUBOT_RANCHER_BEARER_TOKEN }}
92110
TEST_ARTIFACTS_PATH: "tests-artifacts-${{ github.sha }}"
111+
KUBERNETES_CLUSTER_FQDN: "dev.renku.ch"
112+
RENKU_ANONYMOUS_SESSIONS: "true"
93113
renku_ui: "@${{ github.head_ref }}"
94114
renku: "${{ needs.check-deploy.outputs.renku }}"
95115
renku_core: "${{ needs.check-deploy.outputs.renku-core }}"
@@ -105,7 +125,7 @@ jobs:
105125
name: Legacy Cypress tests
106126
runs-on: ubuntu-24.04
107127
needs: [check-deploy, deploy-pr]
108-
if: github.event.action != 'closed' && needs.check-deploy.outputs.pr-contains-string == 'true' && needs.check-deploy.outputs.test-legacy-enabled == 'true'
128+
if: github.event.action != 'closed' && needs.check-deploy.outputs.deploy == 'true' && needs.check-deploy.outputs.test-legacy-enabled == 'true'
109129
strategy:
110130
fail-fast: false
111131
matrix:
@@ -120,7 +140,7 @@ jobs:
120140
steps:
121141
- name: Extract Renku repository reference
122142
run: echo "RENKU_REFERENCE=`echo '${{ needs.check-deploy.outputs.renku }}' | cut -d'@' -f2`" >> $GITHUB_ENV
123-
- uses: SwissDataScienceCenter/renku-actions/test-renku-cypress@v1.18.2
143+
- uses: SwissDataScienceCenter/renku-actions/test-renku-cypress@v1.19.0
124144
with:
125145
e2e-target: ${{ matrix.tests }}
126146
renku-reference: ${{ env.RENKU_REFERENCE }}
@@ -131,7 +151,7 @@ jobs:
131151
name: Cypress tests
132152
runs-on: ubuntu-24.04
133153
needs: [check-deploy, deploy-pr]
134-
if: github.event.action != 'closed' && needs.check-deploy.outputs.pr-contains-string == 'true' && needs.check-deploy.outputs.test-enabled == 'true'
154+
if: github.event.action != 'closed' && needs.check-deploy.outputs.deploy == 'true' && needs.check-deploy.outputs.test-enabled == 'true'
135155
strategy:
136156
fail-fast: false
137157
matrix:
@@ -146,7 +166,7 @@ jobs:
146166
steps:
147167
- name: Extract Renku repository reference
148168
run: echo "RENKU_REFERENCE=`echo '${{ needs.check-deploy.outputs.renku }}' | cut -d'@' -f2`" >> $GITHUB_ENV
149-
- uses: SwissDataScienceCenter/renku-actions/test-renku-cypress@v1.18.2
169+
- uses: SwissDataScienceCenter/renku-actions/test-renku-cypress@v1.19.0
150170
with:
151171
e2e-folder: cypress/e2e/v2/
152172
e2e-target: ${{ matrix.tests }}
@@ -158,9 +178,10 @@ jobs:
158178
name: Cleanup
159179
runs-on: ubuntu-24.04
160180
needs: check-deploy
161-
if: github.event.action == 'closed' && needs.check-deploy.outputs.pr-contains-string == 'true'
181+
if: github.event.action == 'closed' && needs.check-deploy.outputs.deploy == 'true'
162182
permissions:
163183
pull-requests: write
184+
id-token: write
164185
steps:
165186
- name: Find deplyoment url
166187
uses: peter-evans/find-comment@v3
@@ -169,6 +190,7 @@ jobs:
169190
issue-number: ${{ github.event.pull_request.number }}
170191
comment-author: "RenkuBot"
171192
body-includes: "Tearing down the temporary RenkuLab deplyoment"
193+
172194
- name: Create comment deployment url
173195
if: steps.deploymentUrlMessage.outputs.comment-id == 0
174196
uses: peter-evans/create-or-update-comment@v4
@@ -177,11 +199,32 @@ jobs:
177199
issue-number: ${{ github.event.pull_request.number }}
178200
body: |
179201
Tearing down the temporary RenkuLab deplyoment for this PR.
180-
- name: renku teardown
181-
uses: SwissDataScienceCenter/renku-actions/cleanup-renku-ci-deployments@v1.18.2
202+
203+
- name: Azure login
204+
uses: azure/login@v2
205+
with:
206+
client-id: ${{ secrets.CI_RENKU_AZURE_CLIENT_ID }}
207+
tenant-id: ${{ secrets.CI_RENKU_AZURE_TENANT_ID }}
208+
subscription-id: ${{ secrets.CI_RENKU_AZURE_SUBSCRIPTION_ID }}
209+
210+
- name: Set AKS context
211+
uses: azure/aks-set-context@v4
212+
with:
213+
resource-group: "renku-dev"
214+
cluster-name: "aks-switzerlandnorth-renku-dev"
215+
216+
# See: https://github.com/orgs/community/discussions/168949
217+
# It is easier to have the kube config in {{ github.workspace }}.
218+
- name: Setup kubeconfig
219+
run: |
220+
mv "${KUBECONFIG}" "${{ github.workspace }}/renkubot-kube.config"
221+
export KUBECONFIG="${{ github.workspace }}/renkubot-kube.config"
222+
echo "KUBECONFIG=${KUBECONFIG}" >> "$GITHUB_ENV"
223+
224+
- name: Renku teardown
225+
uses: SwissDataScienceCenter/renku-actions/cleanup-renku-ci-deployments@v1.19.0
182226
env:
183227
HELM_RELEASE_REGEX: "^renku-ci-ui-${{ github.event.number }}$"
184228
GITLAB_TOKEN: ${{ secrets.DEV_GITLAB_TOKEN }}
185-
RENKUBOT_KUBECONFIG: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}
186229
MAX_AGE_SECONDS: 0
187230
DELETE_NAMESPACE: "true"

‎.github/workflows/test-and-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,13 @@ jobs:
159159
echo "GIT_USER=Renku Bot" >> $GITHUB_ENV
160160
echo "GIT_EMAIL=renku@datascience.ch" >> $GITHUB_ENV
161161
- name: Push images
162-
uses: SwissDataScienceCenter/renku-actions/publish-chartpress-images@v1.18.2
162+
uses: SwissDataScienceCenter/renku-actions/publish-chartpress-images@v1.19.0
163163
env:
164164
PLATFORMS: "linux/amd64,linux/arm64"
165165
DOCKER_USERNAME: ${{ secrets.RENKU_DOCKER_USERNAME }}
166166
DOCKER_PASSWORD: ${{ secrets.RENKU_DOCKER_PASSWORD }}
167167
- name: Update ui version
168-
uses: SwissDataScienceCenter/renku-actions/update-component-version@v1.18.2
168+
uses: SwissDataScienceCenter/renku-actions/update-component-version@v1.19.0
169169
env:
170170
GITHUB_TOKEN: ${{ secrets.RENKUBOT_GITHUB_TOKEN }}
171171
COMPONENT_NAME: renku-ui

‎client/package-lock.json

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"@sentry/react": "^7.119.1",
5656
"bootstrap": "^5.3.3",
5757
"classnames": "^2.3.2",
58-
"compression": "^1.8.0",
58+
"compression": "^1.8.1",
5959
"d3": "^7.9.0",
6060
"dagre-d3-es": "^7.0.10",
6161
"dompurify": "^3.2.4",
@@ -72,7 +72,7 @@
7272
"lodash-es": "^4.17.21",
7373
"luxon": "^3.3.0",
7474
"mermaid": "^11.4.1",
75-
"morgan": "^1.10.0",
75+
"morgan": "^1.10.1",
7676
"pica": "^9.0.1",
7777
"query-string": "^6.14.1",
7878
"react": "^18.2.0",

0 commit comments

Comments
 (0)