Skip to content

Commit

Permalink
Upgrade dependencies (#354)
Browse files Browse the repository at this point in the history
* Update dependencies

* Release v0.12.2

* Workaround for conflict with Numpy >v2

* Deploy to test cluster now that staging is gone

* Remove numpy version workaround
  • Loading branch information
mmwinther authored Jun 21, 2024
1 parent 23aa068 commit a5ccb4e
Show file tree
Hide file tree
Showing 4 changed files with 1,059 additions and 1,044 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
paths:
- "src/datadoc/**"
- "poetry.lock"
- ".nais/staging-pr.yaml"
- ".nais/test-pr.yaml"
- ".github/workflows/integration-test.yml"

env:
Expand Down Expand Up @@ -82,8 +82,8 @@ jobs:
- uses: nais/deploy/actions/deploy@v2
env:
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
CLUSTER: staging
RESOURCE: .nais/staging-pr.yaml
CLUSTER: test
RESOURCE: .nais/test-pr.yaml
VAR: image=${{ needs.docker-build.outputs.image-tag }},pr-number=${{github.event.number}}
DEPLOY_SERVER: deploy.ssb.cloud.nais.io:443

Expand All @@ -102,6 +102,6 @@ jobs:
with:
application-id: ${{ secrets.DATADOC_MABL_APPLICATION_ID }}
environment-id: ${{ secrets.DATADOC_MABL_ENVIRONMENT_ID }}
uri: https://datadoc-pr-${{github.event.number}}.external.staging.ssb.cloud.nais.io
uri: https://datadoc-pr-${{github.event.number}}.external.test.ssb.cloud.nais.io
mabl-branch: ${{ github.head_ref }}
plan-labels: Datadoc
4 changes: 2 additions & 2 deletions .nais/staging-pr.yaml → .nais/test-pr.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Deploy to staging environment for an individual PR
# Deploy to test environment for an individual PR

apiVersion: nais.io/v1alpha1
kind: Application
Expand Down Expand Up @@ -34,7 +34,7 @@ spec:
enabled: false

ingresses:
- https://datadoc-pr-{{ pr-number }}.external.staging.ssb.cloud.nais.io
- https://datadoc-pr-{{ pr-number }}.external.test.ssb.cloud.nais.io

filesFrom:
- configmap: integration-test-dataset
Expand Down
Loading

0 comments on commit a5ccb4e

Please sign in to comment.