Skip to content

Commit 8594ed1

Browse files
committed
Merge branch 'develop' into optimize-tests
2 parents 9569d52 + 9377ac4 commit 8594ed1

File tree

548 files changed

+8024
-6981
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

548 files changed

+8024
-6981
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@
88
!.git
99
!.gitignore
1010
!Makefile
11+
!gunicorn.conf.py
1112
.git/config

.github/actions/install-linux/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ runs:
3232
renku/templates
3333
key: ${{ env.DEPENDENCY_CACHE_PREFIX }}-${{ runner.os }}-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-${{ hashFiles('poetry.lock') }}-${{ hashFiles('Makefile') }}
3434
env:
35-
DEPENDENCY_CACHE_PREFIX: "v1"
35+
DEPENDENCY_CACHE_PREFIX: "20230929"
3636
- name: Install dependencies
3737
if: steps.dependency-cache.outputs.cache-hit != 'true' || 'refs/heads/master' == github.ref || 'refs/heads/develop' == github.ref || startsWith(github.ref, 'refs/tags/')
3838
env:
@@ -65,7 +65,7 @@ runs:
6565
path: cassettes
6666
key: ${{ env.NETWORK_CACHE_PREFIX }}-${{ steps.year-week.outputs.date }}-${{ hashFiles('poetry.lock') }}-${{ github.job }}
6767
env:
68-
NETWORK_CACHE_PREFIX: "v1"
68+
NETWORK_CACHE_PREFIX: "20230929"
6969
- name: Set coveralls path mapping
7070
shell: bash
7171
run: |

.github/actions/install-macos/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ runs:
4646
path: cassettes
4747
key: ${{ env.NETWORK_CACHE_PREFIX }}-${{ steps.year-week.outputs.date }}-${{ hashFiles('poetry.lock') }}-${{ github.job }}
4848
env:
49-
NETWORK_CACHE_PREFIX: "v1"
49+
NETWORK_CACHE_PREFIX: "20230929"

.github/workflows/acceptance-tests.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,13 @@ jobs:
2626
renku-graph: ${{ steps.deploy-comment.outputs.renku-graph}}
2727
renku-notebooks: ${{ steps.deploy-comment.outputs.renku-notebooks}}
2828
renku-ui: ${{ steps.deploy-comment.outputs.renku-ui}}
29+
renku-data-services: ${{ steps.deploy-comment.outputs.renku-data-services}}
2930
test-enabled: ${{ steps.deploy-comment.outputs.test-enabled}}
3031
extra-values: ${{ steps.deploy-comment.outputs.extra-values}}
3132
persist: ${{ steps.deploy-comment.outputs.persist}}
3233
steps:
3334
- id: deploy-comment
34-
uses: SwissDataScienceCenter/renku-actions/check-pr-description@v1.4.5
35+
uses: SwissDataScienceCenter/renku-actions/check-pr-description@v1.7.0
3536
with:
3637
string: /deploy
3738
pr_ref: ${{ github.event.number }}
@@ -43,7 +44,7 @@ jobs:
4344
name: renku-ci-rp-${{ github.event.number }}
4445
steps:
4546
- name: deploy-pr
46-
uses: SwissDataScienceCenter/renku-actions/deploy-renku@v1.4.5
47+
uses: SwissDataScienceCenter/renku-actions/deploy-renku@v1.7.0
4748
env:
4849
DOCKER_PASSWORD: ${{ secrets.RENKU_DOCKER_PASSWORD }}
4950
DOCKER_USERNAME: ${{ secrets.RENKU_DOCKER_USERNAME }}
@@ -52,7 +53,7 @@ jobs:
5253
RANCHER_PROJECT_ID: ${{ secrets.CI_RANCHER_PROJECT }}
5354
RENKU_RELEASE: renku-ci-rp-${{ github.event.number }}
5455
RENKU_VALUES_FILE: "${{ github.workspace }}/values.yaml"
55-
RENKU_VALUES: ${{ secrets.CI_RENKU_VALUES }}
56+
RENKU_VALUES: ${{ secrets.COMBINED_CHARTS_CI_RENKU_VALUES }}
5657
RENKUBOT_KUBECONFIG: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}
5758
RENKUBOT_RANCHER_BEARER_TOKEN: ${{ secrets.RENKUBOT_RANCHER_BEARER_TOKEN }}
5859
RANCHER_DEV_API_ENDPOINT: ${{ secrets.RANCHER_DEV_API_ENDPOINT }}
@@ -66,6 +67,7 @@ jobs:
6667
renku_graph: "${{ needs.check-deploy.outputs.renku-graph }}"
6768
renku_notebooks: "${{ needs.check-deploy.outputs.renku-notebooks }}"
6869
renku_ui: "${{ needs.check-deploy.outputs.renku-ui }}"
70+
renku_data_services: "${{ needs.check-deploy.outputs.renku-data-services }}"
6971
extra_values: "${{ needs.check-deploy.outputs.extra-values }}"
7072
- name: Check existing renkubot comment
7173
uses: peter-evans/find-comment@v2
@@ -88,7 +90,7 @@ jobs:
8890
if: ${{ github.event.action != 'closed' && needs.check-deploy.outputs.pr-contains-string == 'true' && needs.check-deploy.outputs.test-enabled == 'true' }}
8991
needs: [check-deploy, deploy-pr]
9092
steps:
91-
- uses: SwissDataScienceCenter/renku-actions/test-renku@v1.4.5
93+
- uses: SwissDataScienceCenter/renku-actions/test-renku@v1.7.0
9294
with:
9395
kubeconfig: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}
9496
renku-release: renku-ci-rp-${{ github.event.number }}
@@ -103,7 +105,7 @@ jobs:
103105
runs-on: ubuntu-20.04
104106
steps:
105107
- name: renku teardown
106-
uses: SwissDataScienceCenter/renku-actions/cleanup-renku-ci-deployments@v1.4.5
108+
uses: SwissDataScienceCenter/renku-actions/cleanup-renku-ci-deployments@v1.7.0
107109
env:
108110
HELM_RELEASE_REGEX: "^renku-ci-rp-${{ github.event.number }}$"
109111
GITLAB_TOKEN: ${{ secrets.DEV_GITLAB_TOKEN }}

.github/workflows/cheatsheet.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
if: "'refs/heads/master' != github.ref && 'refs/heads/develop' != github.ref && !startsWith(github.ref, 'refs/tags/')"
1414
steps:
15-
- uses: actions/checkout@v3.5.2
15+
- uses: actions/checkout@v3.6.0
1616
with:
1717
fetch-depth: 0
1818
- name: Install dependencies

.github/workflows/combine-dependabot-updates.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
combine-prs:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v3.5.2
20+
- uses: actions/checkout@v3.6.0
2121
with:
2222
fetch-depth: 0
2323
token: "${{ secrets.RENKUBOT_GITHUB_TOKEN }}"

.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ jobs:
77
triage:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/labeler@4.1.0
10+
- uses: actions/labeler@v4.3.0
1111
with:
1212
repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/publish_shacl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
build:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3.5.2
14+
- uses: actions/checkout@v3.6.0
1515
with:
1616
fetch-depth: 0
1717
- name: Install dependencies

.github/workflows/pypi-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
finalize-release:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3.5.2
14+
- uses: actions/checkout@v3.6.0
1515
with:
1616
fetch-depth: 0
1717
token: "${{ secrets.RENKUBOT_GITHUB_TOKEN }}"

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
create-release-pr:
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v3.5.2
24+
- uses: actions/checkout@v3.6.0
2525
with:
2626
fetch-depth: 0
2727
token: "${{ secrets.RENKUBOT_GITHUB_TOKEN }}"

0 commit comments

Comments
 (0)