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.

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

Deps bump - April 2024 #136

Merged
merged 13 commits into from
Apr 24, 2024
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ pipeline {
string(credentialsId: 'chalk-prod-cd-oauth-refresh-token', variable: 'CHALK_OAUTH_REFRESH_TOKEN'),
]) {
dir('tests') {
sh 'pip install "playwright==1.41.2" "pytest==8.0.2"'
sh 'pip install "playwright==1.43.0" "pytest==8.1.1"'
sh "pytest . --server_domain ${SERVER_IP} --junitxml=playwright_results.xml || true"

junit testResults: 'playwright_results.xml'
Expand Down
9 changes: 5 additions & 4 deletions helm/templates/db-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,11 @@ spec:
shareProcessNamespace: true
containers:
- name: cloud-sql-proxy
image: gcr.io/cloudsql-docker/gce-proxy:latest
command:
- "/cloud_sql_proxy"
- {{ printf "-instances=%s:us-east4:%s=tcp:5432" .Values.gcpProject (include "..dbInstanceName" .) | quote }}
image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:latest
args:
- "--structured-logs"
- "--port=5432"
- {{ printf "%s:us-east4:%s" .Values.gcpProject (include "..dbInstanceName" .) | quote }}
securityContext:
runAsNonRoot: true
- name: db-restorer
Expand Down
9 changes: 5 additions & 4 deletions helm/templates/server-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,11 @@ spec:
{{- include "..serverEnv" . | nindent 12 }}
containers:
- name: server-cloud-sql-proxy
image: gcr.io/cloudsql-docker/gce-proxy:latest
command:
- "/cloud_sql_proxy"
- {{ printf "-instances=%s:us-east4:%s=tcp:5432" .Values.gcpProject (include "..dbInstanceName" .) | quote }}
image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:latest
args:
- "--structured-logs"
- "--port=5432"
- {{ printf "%s:us-east4:%s" .Values.gcpProject (include "..dbInstanceName" .) | quote }}
securityContext:
runAsNonRoot: true
resources:
Expand Down
4 changes: 2 additions & 2 deletions jenkins/gcloud_helm.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM gcr.io/google.com/cloudsdktool/cloud-sdk:alpine
FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:alpine

RUN gcloud components install kubectl -q --no-user-output-enabled

# Install Helm
RUN mkdir helm_tmp \
&& curl -o helm_tmp/helm.tar.gz https://get.helm.sh/helm-v3.14.2-linux-amd64.tar.gz \
&& curl -o helm_tmp/helm.tar.gz https://get.helm.sh/helm-v3.14.4-linux-amd64.tar.gz \
&& tar -zxvf helm_tmp/helm.tar.gz -C helm_tmp \
&& mv helm_tmp/linux-amd64/helm /bin/helm \
&& rm -rf helm_tmp
2 changes: 1 addition & 1 deletion server/dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
flake8==7.0.0
pylint==3.1.0
pylint-django==2.5.5
pytest==8.0.2
pytest==8.1.1
yapf==0.40.2
2 changes: 1 addition & 1 deletion server/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Django==4.2.11
djangorestframework==3.14.0
djangorestframework==3.15.1
django-simple-history==3.5.0
google-auth-oauthlib==1.2.0
gunicorn==22.0.0
Expand Down
52 changes: 26 additions & 26 deletions ui/js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,41 +5,41 @@
"dependencies": {
"@expo-google-fonts/roboto": "^0.2.3",
"@expo/metro-runtime": "~3.1.3",
"@react-native-google-signin/google-signin": "11.0.0",
"@reduxjs/toolkit": "^2.2.1",
"@sentry/react-native": "5.21.0",
"expo": "~50.0.8",
"expo-application": "~5.8.3",
"@react-native-google-signin/google-signin": "11.0.1",
"@reduxjs/toolkit": "^2.2.3",
"@sentry/react-native": "5.22.0",
"expo": "~50.0.17",
"expo-application": "~5.8.4",
"expo-auth-session": "~5.4.0",
"expo-build-properties": "~0.11.1",
"expo-constants": "~15.4.5",
"expo-dev-client": "~3.3.9",
"expo-device": "~5.9.3",
"expo-constants": "~15.4.6",
"expo-dev-client": "~3.3.11",
"expo-device": "~5.9.4",
"expo-font": "~11.10.3",
"expo-random": "~13.6.0",
"expo-splash-screen": "~0.26.4",
"expo-updates": "~0.24.11",
"expo-updates": "~0.24.12",
"expo-web-browser": "~12.8.2",
"js-cookie": "^3.0.1",
"lodash": "^4.17.21",
"prop-types": "*",
"react": "~18.2.0",
"react-dom": "~18.2.0",
"react-native": "0.73.5",
"react-native": "0.73.6",
"react-native-draggable-flatlist": "4.0.1",
"react-native-gesture-handler": "~2.14.0",
"react-native-paper": "~5.12.3",
"react-native-reanimated": "3.7.2",
"react-native-reanimated": "~3.8.1",
"react-native-safe-area-context": "4.9.0",
"react-native-safe-area-view": "^1.1.1",
"react-native-web": "~0.19.9",
"react-redux": "^9.1.0",
"react-native-web": "~0.19.11",
"react-redux": "^9.1.1",
"redux": "^5.0.1",
"redux-thunk": "^3.1.0",
"sentry-expo": "~7.2.0"
},
"devDependencies": {
"@babel/core": "^7.23.5",
"@babel/core": "^7.24.4",
"@storybook/addon-essentials": "^7.6.17",
"@storybook/addon-interactions": "^7.6.17",
"@storybook/addon-links": "^7.6.17",
Expand All @@ -51,37 +51,37 @@
"@storybook/react-webpack5": "^7.6.17",
"@storybook/testing-library": "^0.2.2",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^14.2.1",
"@testing-library/react": "^15.0.2",
"@testing-library/react-hooks": "^8.0.1",
"@testing-library/user-event": "^14.5.1",
"@types/jest": "^29.5.12",
"@types/js-cookie": "^3.0.6",
"@types/lodash": "^4.14.202",
"@types/node": "^20.11.24",
"@types/react": "~18.2.61",
"@types/react-dom": "~18.2.19",
"@types/lodash": "^4.17.0",
"@types/node": "^20.12.7",
"@types/react": "~18.2.79",
"@types/react-dom": "~18.2.25",
"@types/react-redux": "^7.1.32",
"@typescript-eslint/eslint-plugin": "^7.1.0",
"@typescript-eslint/parser": "^7.1.0",
"@typescript-eslint/eslint-plugin": "^7.7.1",
"@typescript-eslint/parser": "^7.7.1",
"babel-jest": "^29.7.0",
"babel-plugin-react-native-web": "0.19.10",
"eas-cli": "7.3.0",
"babel-plugin-react-native-web": "0.19.11",
"eas-cli": "7.8.2",
"eslint": "^8.57.0",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-react": "^7.29.4",
"eslint-plugin-react": "^7.34.1",
"fetch-mock-jest": "^1.5.1",
"file-loader": "6.2.0",
"husky": "^9.0.11",
"jest": "^29.7.0",
"jest-environment-jsdom": "29.7.0",
"jest-expo": "~50.0.2",
"jest-expo": "~50.0.4",
"jest-junit": "^16.0.0",
"lint-staged": "^15.2.2",
"metro-react-native-babel-preset": "0.77.0",
"prettier": "^3.2.5",
"react-test-renderer": "^18.2.0",
"storybook": "^7.6.17",
"typescript": "^5.3.3",
"typescript": "^5.4.5",
"xmldom": "^0.6.0"
},
"scripts": {
Expand Down
Loading
Loading