Merge remote-tracking branch 'contextus/master' into jmc_aug31

Sefaria · Sep 13, 2023 · fdd83e8 · fdd83e8
2 parents 5eeebb2 + 42a0338
commit fdd83e8
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/.github/workflows/production-deploy.yaml b/.github/workflows/production-deploy.yaml
@@ -28,9 +28,13 @@ jobs:
       - id: check
         run: |
           if [[ "${{ inputs.version }}" == "" ]]; then
-            echo "ref=${{ github.ref_name }}" >> $GITHUB_OUTPUT 
+            echo "ref=${{ github.ref_name }}" >> $GITHUB_OUTPUT
           else
-            echo "ref=v${{ inputs.version }}" >> $GITHUB_OUTPUT
+            if [[ ${{ inputs.version }} == v* ]]; then
+              echo "ref=${{ inputs.version }}" >> $GITHUB_OUTPUT
+            else
+              echo "ref=v${{ inputs.version }}" >> $GITHUB_OUTPUT
+            fi
           fi
   build-generic:
     needs: workflow-check
@@ -54,8 +58,8 @@ jobs:
         uses: google-github-actions/auth@v1
         with:
           token_format: 'access_token'
-          workload_identity_provider: 'projects/${{ secrets.PROD_GKE_PROJECT_ID}}/locations/global/workloadIdentityPools/github/providers/github'
-          service_account: '${{ secrets.PROD_GKE_SA }}'
+          workload_identity_provider: 'projects/${{ secrets.CONTEXTUS_GKE_PROJECT_ID}}/locations/global/workloadIdentityPools/github/providers/github'
+          service_account: '${{ secrets.CONTEXTUS_GKE_SA }}'
       - name: Login to GCR
         uses: docker/login-action@v1
         with:
@@ -120,8 +124,8 @@ jobs:
         uses: google-github-actions/auth@v1
         with:
           token_format: 'access_token'
-          workload_identity_provider: 'projects/${{ secrets.PROD_GKE_PROJECT_ID}}/locations/global/workloadIdentityPools/github/providers/github'
-          service_account: '${{ secrets.PROD_GKE_SA }}'
+          workload_identity_provider: 'projects/${{ secrets.CONTEXTUS_GKE_PROJECT_ID}}/locations/global/workloadIdentityPools/github/providers/github'
+          service_account: '${{ secrets.CONTEXTUS_GKE_SA }}'
       - name: Login to GCR
         uses: docker/login-action@v1
         with:
@@ -170,7 +174,6 @@ jobs:
       contents: 'read'
       id-token: 'write'
     needs:
-
       - build-derived
       - workflow-check
     steps:
@@ -183,8 +186,8 @@ jobs:
         uses: google-github-actions/auth@v1
         with:
           token_format: 'access_token'
-          workload_identity_provider: 'projects/${{ secrets.PROD_GKE_PROJECT_ID}}/locations/global/workloadIdentityPools/github/providers/github'
-          service_account: '${{ secrets.PROD_GKE_SA }}'
+          workload_identity_provider: 'projects/${{ secrets.CONTEXTUS_GKE_PROJECT_ID}}/locations/global/workloadIdentityPools/github/providers/github'
+          service_account: '${{ secrets.CONTEXTUS_GKE_SA }}'
       - name: Setup GCloud
         uses: google-github-actions/setup-gcloud@v0
         with:
@@ -222,6 +225,6 @@ jobs:
           -H "Accept: application/vnd.github+json" 
           -H "Authorization: Bearer ${{ secrets.WORKFLOW_AUTOMATION_TOKEN }}" 
           -H "X-GitHub-Api-Version: 2022-11-28"
-          https://api.github.com/repos/Sefaria/Sefaria-Project/actions/variables/CHART_VERSION
+          https://api.github.com/repos/Sefaria/Contextus/actions/variables/CHART_VERSION
           -d '{"name":"CHART_VERSION","value":"${{ steps.chart_version.outputs.chart_version }}"}'
 
diff --git a/.github/workflows/release-contextus.yml b/.github/workflows/release-contextus.yml
@@ -12,7 +12,7 @@ jobs:
   semantic-release:
     runs-on: ubuntu-latest
     outputs:
-      version: ${{ steps.semantic.outputs.release-version }}
+      version: ${{ steps.releaseVersion.outputs.releaseVersion }}
     steps:
       - uses: actions/checkout@v3
       - uses: cycjimmy/semantic-release-action@v4

diff --git a/build/ci/production-values.yaml b/build/ci/production-values.yaml
@@ -2,7 +2,7 @@ sandbox: "false"
 contentSandbox: "false"
 deployEnv: production
 previousServicesCount: "3"
-deploymentMessage: true
+deploymentMessage: false
 restore:
   enabled: true
   bucket: sefaria-contextus-backup

diff --git a/build/web/Dockerfile b/build/web/Dockerfile
@@ -3,7 +3,7 @@ FROM gcr.io/production-deployment/base-web:v3.7-bullseye
 WORKDIR /app/
 # Copied separately to allow for caching of the `pip install` build step
 COPY requirements.txt /app/requirements.txt
-RUN pip3 install --no-cache-dir -r /app/requirements.txt && opentelemetry-bootstrap -a install 
+RUN pip3 install --no-cache-dir -r /app/requirements.txt
 
 COPY package*.json /app/
 RUN npm install --unsafe-perm

diff --git a/cli.py b/cli.py
@@ -1,5 +1,5 @@
 import django
-django.setup()
+django.setup() # comment for the sake of commit
 
 from sefaria.model import *
 import sefaria.system.database as database