Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade dependencies #354

Merged
merged 5 commits into from
Jun 21, 2024
Merged

Upgrade dependencies #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
51c786e
Update dependencies
mmwinther Jun 19, 2024
da5261a
Release v0.12.2
mmwinther Jun 19, 2024
875e0b9
Workaround for conflict with Numpy >v2
mmwinther Jun 19, 2024
8fbe869
Deploy to test cluster now that staging is gone
mmwinther Jun 19, 2024
e9e1827
Remove numpy version workaround
mmwinther Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/integration-test.yml
View file
Open in desktop
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
View file
Open in desktop
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