Skip to content

Commit 543940e

Browse files
Merge pull request #898 from sparrowapp-dev/release/2.34.0
Release/2.34.0 to Prod
2 parents 5bb60f0 + efa8e83 commit 543940e

File tree

59 files changed

+4377
-194
lines changed

Some content is hidden

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

59 files changed

+4377
-194
lines changed

.env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ AZURE_CONNECTION_STRING= # Azure Storage connection string
8282
AZURE_INSIGHTS_CONNECTION_STRING= # Azure Application Insights connection string
8383
FEEDBACK_BLOB_CONTAINER= # Azure Blob container name for feedback storage
8484
AI_CONVERSATION_BLOB_CONTAINER= # Azure Blob container name for AI Conversation storage
85+
DOWNGRADE_HUB_BLOB_CONTAINER= # Azure Blob container name for downgrade Hub Details storage.
8586

8687
# [AI SERVICES]
8788
# Azure OpenAI Configuration

.github/workflows/release-v2.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ jobs:
1414
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
1515
KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
1616
RELEASE_NAMESPACE: ${{ secrets.RELEASE_NAMESPACE }}
17-
SPARROW_GITHUB_TOKEN: ${{ secrets.SPARROW_GITHUB_TOKEN }}
17+
SPARROW_GITHUB_TOKEN: ${{ secrets.SPARROW_GITHUB_TOKEN }}
18+

.github/workflows/staging.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Staging
2+
on:
3+
push:
4+
branches:
5+
- release/2.34.0
6+
7+
jobs:
8+
build:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@master
12+
13+
- uses: Azure/docker-login@v1
14+
with:
15+
login-server: sparrowprod.azurecr.io
16+
username: ${{ secrets.REGISTRY_USERNAME }}
17+
password: ${{ secrets.REGISTRY_PASSWORD }}
18+
19+
- run: |
20+
docker build . -t sparrowprod.azurecr.io/sparrow-api:${{ github.run_number }} --build-arg GITHUB_TOKEN=${{ secrets.SPARROW_GITHUB_TOKEN }}
21+
docker push sparrowprod.azurecr.io/sparrow-api:${{ github.run_number }}
22+
deploy:
23+
needs: build
24+
runs-on: ubuntu-latest
25+
steps:
26+
- uses: actions/checkout@master
27+
- uses: richardrigutins/replace-in-files@v1
28+
with:
29+
files: "./deploymentManifests/deployment.yml"
30+
search-text: '_BUILD__ID_'
31+
replacement-text: '${{ github.run_number }}'
32+
33+
- uses: azure/[email protected]
34+
35+
- uses: Azure/k8s-set-context@v2
36+
with:
37+
kubeconfig: ${{ secrets.KUBE_CONFIG }}
38+
39+
- uses: Azure/k8s-deploy@v4
40+
with:
41+
action: deploy
42+
namespace: sparrow-staging
43+
manifests: |
44+
./deploymentManifests/deployment.yml

deploymentManifests/deployment.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,13 @@ spec:
425425
valueFrom:
426426
secretKeyRef:
427427
name: sparrow-api-secret
428-
key: APP_LINUX_VERSION
428+
key: APP_LINUX_VERSION
429+
- name: DOWNGRADE_HUB_BLOB_CONTAINER
430+
valueFrom:
431+
secretKeyRef:
432+
name: sparrow-api-secret
433+
key: DOWNGRADE_HUB_BLOB_CONTAINER
434+
429435
---
430436
apiVersion: v1
431437
kind: Service

deploymentManifests/release-v2.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,12 @@ spec:
394394
valueFrom:
395395
secretKeyRef:
396396
name: release-api-v2-secret
397-
key: APP_LINUX_VERSION
397+
key: APP_LINUX_VERSION
398+
- name: DOWNGRADE_HUB_BLOB_CONTAINER
399+
valueFrom:
400+
secretKeyRef:
401+
name: release-api-v2-secret
402+
key: DOWNGRADE_HUB_BLOB_CONTAINER
398403

399404

400405
---

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "project-sparrow-api",
3-
"version": "2.33.0",
3+
"version": "2.34.0",
44
"description": "Backend APIs for Project Sparrow.",
55
"author": "techdome",
66
"license": "",
@@ -82,6 +82,7 @@
8282
"crypto-js": "^4.2.0",
8383
"curlconverter": "^4.9.0",
8484
"dotenv": "16.0.1",
85+
"exceljs": "^4.4.0",
8586
"fastify": "4.28.1",
8687
"form-data": "^4.0.1",
8788
"gravatar": "1.8.2",

0 commit comments

Comments
 (0)