Skip to content

Commit 8a07faf

Browse files
committed
Merge branch 'master' into develop
2 parents 0d3c176 + a60ca7f commit 8a07faf

File tree

6 files changed

+19
-9
lines changed

6 files changed

+19
-9
lines changed

.github/workflows/acceptance-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
persist: ${{ steps.deploy-comment.outputs.persist}}
3232
steps:
3333
- id: deploy-comment
34-
uses: SwissDataScienceCenter/renku-actions/[email protected].1
34+
uses: SwissDataScienceCenter/renku-actions/[email protected].2
3535
with:
3636
string: /deploy
3737
pr_ref: ${{ github.event.number }}
@@ -43,7 +43,7 @@ jobs:
4343
name: renku-ci-rp-${{ github.event.number }}
4444
steps:
4545
- name: deploy-pr
46-
uses: SwissDataScienceCenter/renku-actions/[email protected].1
46+
uses: SwissDataScienceCenter/renku-actions/[email protected].2
4747
env:
4848
DOCKER_PASSWORD: ${{ secrets.RENKU_DOCKER_PASSWORD }}
4949
DOCKER_USERNAME: ${{ secrets.RENKU_DOCKER_USERNAME }}
@@ -88,7 +88,7 @@ jobs:
8888
if: ${{ github.event.action != 'closed' && needs.check-deploy.outputs.pr-contains-string == 'true' && needs.check-deploy.outputs.test-enabled == 'true' }}
8989
needs: [check-deploy, deploy-pr]
9090
steps:
91-
- uses: SwissDataScienceCenter/renku-actions/[email protected].1
91+
- uses: SwissDataScienceCenter/renku-actions/[email protected].2
9292
with:
9393
renkubot-kubeconfig: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}
9494
renku-release: renku-ci-rp-${{ github.event.number }}
@@ -102,7 +102,7 @@ jobs:
102102
runs-on: ubuntu-20.04
103103
steps:
104104
- name: renku teardown
105-
uses: SwissDataScienceCenter/renku-actions/[email protected].1
105+
uses: SwissDataScienceCenter/renku-actions/[email protected].2
106106
env:
107107
HELM_RELEASE_REGEX: "^renku-ci-rp-${{ github.event.number }}$"
108108
GITLAB_TOKEN: ${{ secrets.DEV_GITLAB_TOKEN }}

.github/workflows/test_deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,7 @@ jobs:
941941
echo "GIT_USER=Renku Bot" >> $GITHUB_ENV
942942
echo "[email protected]" >> $GITHUB_ENV
943943
- name: Push chart and images
944-
uses: SwissDataScienceCenter/renku-actions/[email protected].1
944+
uses: SwissDataScienceCenter/renku-actions/[email protected].2
945945
env:
946946
CHART_NAME: renku-core
947947
GITHUB_TOKEN: ${{ secrets.RENKUBOT_GITHUB_TOKEN }}
@@ -950,7 +950,7 @@ jobs:
950950
- name: Wait for chart to be available
951951
run: sleep 120
952952
- name: Update component version
953-
uses: SwissDataScienceCenter/renku-actions/[email protected].1
953+
uses: SwissDataScienceCenter/renku-actions/[email protected].2
954954
env:
955955
CHART_NAME: renku-core
956956
GITHUB_TOKEN: ${{ secrets.RENKUBOT_GITHUB_TOKEN }}

CHANGES.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@
1818
Changes
1919
=======
2020

21+
`1.2.2 <https://github.com/SwissDataScienceCenter/renku-python/compare/v1.2.1...v1.2.2>`__ (2022-04-13)
22+
-------------------------------------------------------------------------------------------------------
23+
24+
This is a hotfix release.
25+
26+
Bug Fixes
27+
~~~~~~~~~
28+
29+
- **core:** fix SHACL shape to properly validate imported ``Dataset.datePublished`` for Zenodo
30+
2131
`1.2.1 <https://github.com/SwissDataScienceCenter/renku-python/compare/v1.2.0...v1.2.1>`__ (2022-04-11)
2232
-------------------------------------------------------------------------------------------------------
2333

helm-chart/renku-core/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ appVersion: "1.0"
33
description: A Helm chart for Kubernetes
44
name: renku-core
55
icon: https://avatars0.githubusercontent.com/u/53332360?s=400&u=a4311d22842343604ef61a8c8a1e5793209a67e9&v=4
6-
version: 1.2.1
6+
version: 1.2.2

helm-chart/renku-core/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ versions:
109109
fullnameOverride: ""
110110
image:
111111
repository: renku/renku-core
112-
tag: "v1.2.1"
112+
tag: "v1.2.2"
113113
pullPolicy: IfNotPresent
114114
v8:
115115
name: v8

renku/data/shacl_shape.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@
408408
"@id": "xsd:string"
409409
},
410410
"maxCount": 1,
411-
"sh:pattern": "\\d{4}-\\d{2}-\\d{2}(T\\d{2}:\\d{2}:\\d{2}\\+\\d{2}:\\d{2})?"
411+
"sh:pattern": "^\\d{4}-\\d{2}-\\d{2}(T\\d{2}:\\d{2}:\\d{2}\\+\\d{2}:\\d{2})?$"
412412
},
413413
{
414414
"nodeKind": "sh:Literal",

0 commit comments

Comments
 (0)