Tracking pull request to merge release-1.52.0 to master (#1972)

* update to 1.52.0 * update pr number * fix: incorrect 21 warnings (#1973) * update create release * update create release --------- Co-authored-by: tim738745 <[email protected]>
bcgov · Sep 29, 2023 · c80dfc3 · c80dfc3
1 parent a8b80b2
commit c80dfc3
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 20 deletions.
diff --git a/.github/workflows/create-release.yaml b/.github/workflows/create-release.yaml
@@ -6,17 +6,22 @@ on:
       - 'master'     
 
 jobs:
+
   create-release:
     runs-on: ubuntu-latest
-    env:
-      releasename: ${{ github.event.pull_request.head.ref }}
     steps:
       - uses: actions/checkout@v3
+      - name: Replace release name
+        uses: mad9000/actions-find-and-replace-string@4
+        with:
+          source: ${{ github.event.pull_request.head.ref }}
+          find: 'release-'
+          replace: 'v'
       - name: Create Release
         uses: softprops/action-gh-release@v1
         with:
-          name: ${releasename/release-/v}
-          tag_name: ${releasename/release-/v}
+          name: ${{ github.event.pull_request.head.ref }}
+          tag_name: ${{ github.event.pull_request.head.ref }}
           body: |
             ${{ github.event.pull_request.body }}
           token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/dev-build.yaml b/.github/workflows/dev-build.yaml
@@ -1,11 +1,11 @@
 ## For each release, please update the value of workflow name, branches and PR_NUMBER
 ## Also update frontend/package.json version
 
-name: Dev Build 1.51.0
+name: Dev Build 1.52.0
 
 on:
   push:
-    branches: [ release-1.51.0 ]
+    branches: [ release-1.52.0 ]
     paths:
       - frontend/**
       - backend/**
@@ -14,8 +14,8 @@ on:
 
 env:
   ## The pull request number of the Tracking pull request to merge the release branch to main
-  PR_NUMBER: 1951
-  VERSION: 1.51.0
+  PR_NUMBER: 1972
+  VERSION: 1.52.0
   GIT_URL: https://github.com/bcgov/zeva.git 
   TOOLS_NAMESPACE: ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-tools
   DEV_NAMESPACE: ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-dev
@@ -32,7 +32,7 @@ jobs:
   call-unit-test:
     uses: ./.github/workflows/unit-test-template.yaml
     with:
-      pr-number: 1951
+      pr-number: 1972
 
   build:
 

diff --git a/.github/workflows/release-build.yaml b/.github/workflows/release-build.yaml
@@ -1,16 +1,16 @@
 ## For each release, please update the value of workflow name, branches and PR_NUMBER
 ## Also update frontend/package.json version
 
-name: Release Build 1.51.0
+name: Release Build 1.52.0
 
 on:
   workflow_dispatch:
   workflow_call:
 
 env:
   ## The pull request number of the Tracking pull request to merge the release branch to main
-  PR_NUMBER: 1951
-  VERSION: 1.51.0
+  PR_NUMBER: 1972
+  VERSION: 1.52.0
   GIT_URL: https://github.com/bcgov/zeva.git 
   TOOLS_NAMESPACE: ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-tools
   DEV_NAMESPACE: ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-dev
@@ -27,7 +27,7 @@ jobs:
   call-unit-test:
     uses: ./.github/workflows/unit-test-template.yaml
     with:
-      pr-number: 1951
+      pr-number: 1972
 
   build:
 

diff --git a/backend/api/services/sales_submission.py b/backend/api/services/sales_submission.py
@@ -306,7 +306,7 @@ def populate_date_warnings(warnings, sales_submission_contents):
                 sale_date = parse(str(content.xls_sale_date), fuzzy=True)
             except ValueError:
                 add_warning(warnings, content_id, invalid_date_warning)
-        
+
         if sale_date is not None and sale_date < datetime.datetime(2018, 1, 2):
             add_warning(warnings, content_id, expired_date_warning)
 
@@ -326,7 +326,9 @@ def populate_already_awarded_warnings(
         matching_records = []
         for sale_record in sale_records:
             if (
-                sale_record.submission != content.submission
+                sale_record.submission.validation_status
+                != SalesSubmissionStatuses.REJECTED
+                and sale_record.submission != content.submission
                 and sale_record.create_timestamp < content.update_timestamp
             ):
                 matching_records.append(sale_record)

diff --git a/charts/zeva-spilo/values-prod.yaml b/charts/zeva-spilo/values-prod.yaml
@@ -31,11 +31,11 @@ spilo:
 
   resources:
     limits:
-      cpu: 720m
-      memory: 800Mi
+      cpu: 1200m
+      memory: 1000Mi
     requests:
-      cpu: 360m
-      memory: 400Mi  
+      cpu: 500m
+      memory: 500Mi  
 
   podDisruptionBudget:
     enabled: false

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zeva-frontend",
-  "version": "1.51.0",
+  "version": "1.52.0",
   "private": true,
   "dependencies": {
     "@babel/eslint-parser": "^7.19.1",