Skip to content

Commit

Permalink
Tracking pull request to merge release-2.9.0 to master (#2404)
Browse files Browse the repository at this point in the history
* 2.9.0

* changing interceptor message

* chore: updated jwt dependancies

* schedule d delete button fix

* fix fo Unable to delete draft File Submissions

* add build template

* add build template

* add build template

* mv build template to jan branch

* update pr number

* add pipeline for jan release

* update

* update

* update

* update to tem-jan branch

* update to tem-jan branch

* add new bcdk

* cleanup

* New 'agreement date' entry field in new credit transfer proposal page

* Bump django from 3.2.19 to 3.2.20 in /backend

Bumps [django](https://github.com/django/django) from 3.2.19 to 3.2.20.
- [Commits](django/django@3.2.19...3.2.20)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* updating the suggestion and styling

* schedule d tab delete update

* feat: added credit trade categories

* feat: added category d selection

* feat: update category calculation and added signinghistory unit tests

* feat: updated logic on tradeEffectiveDate

* feat: updated user visibility logic around persmissions

* fix: minor syntax fix

* remove graphics

* fix for supplemental report number

* feat: added category column to credit transaction excel download

* Prevent fuel suppliers from creating report 2024 and beyond

* feat: added effectiveDate to credit transfer view

* backend trade_effective_date updated in service methods

* feat: added max date to effective date selection

* fix: added check for existing categories to avoid duplication failure

* hide effective date form until jan 2024

* feat: updated approval of credit transfers to check for future effective dates properly

* fix: logic fixes on future effective date methods

* chore: disabled manual input on date inputs

* fix: transfer category date ranges fixed

* update pipleine readme

* update pipleine readme

* add dev to approval list

* fix: var used before declaration

* fixed submission logic on empty string

* feat: added validation for effective date to be greater than today and less than 3 months in the future

* add create release pipeline

* update the branch name to master'

* update the decrioption of new release branch creation

* fix: fixed buyer rescind on credit trades, updated unit tests

* fix: updated category logic on backend for credit trades

* fix: hide category d button on approved and rescinded statuses

* update the tfrs release doc (#2518)

* added additional status checks

* feat: limit agreement date to be in the past

* fix: updated text for credit transfers

* fix: removed errant setting of effective date

* compliance units not showing in reserv after credit transfer fix

* removing buy option from credit transfer

* fix: updated validations on credit trades for government users, fixed click through bug on delete from queue, fix submit bug on historical trade view

* fix for credit transfer in future for effective date

* fix: get compliance period null trade effective date fix, approval date display fix

* fix: fixed category calculation on backend

* updating code to default to sell

* fix: hide effective date inputs on main branch

* added max date to effective date on historical data entry

* fix: approval date now shows correctly in signing history, categorization now only shows on credit transfers thatt have an agreement date

* feat: updated savedState to persist filter options on compliance reports list view

* Credit Transfer Rescinded and Declined fix

* adding update to hide checkbox when status is rescineded

* removing debug logs

* fix: made all credit transfer types show effective_date as either trade_effective_date or last_updated_at

* fix: updated logic around effective dates in credit transfer download

* fix: removed check for trade_effective_date in credit transfer excel download

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: jig-patel <[email protected]>
Co-authored-by: Alex Zorkin <[email protected]>
Co-authored-by: Your Name <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Prashanth <[email protected]>
  • Loading branch information
6 people committed Aug 29, 2023
1 parent 8982233 commit be06494
Show file tree
Hide file tree
Showing 87 changed files with 2,927 additions and 319 deletions.
56 changes: 41 additions & 15 deletions .github/readme.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,47 @@

# TFRS Post Release Work
After the release is deployed on Prod
# Production release

## Pre-production release

* Update the description of the tracking pull request
* Verify the changes made during the previous post production release

## Production release

* Manually trigger the pipeline tfrs-release.yaml

## Post production release

* Merge the tracking pull request to master
* Create the release from master amd make it as the lasted release
* Create the release tag from master amd make it as the lasted release (this is done automatically by pipeline create-release.yaml)
* Create the new release branch from master
* Update the following fields in various files
* Create the tracking pull request to merge the new release branch to master
* Update tfrs-release.yaml
* name
* branches
* PR_NUMBER
* RELEASE_NAME
* Update .pipeline/lib/config.js
* const version
* releaseBranch
* Update frontend/package.json
* version
* update dev-release.yaml
* name
* branches
* PR_NUMBER
* RELEASE_NAME
* Commit all the above changes and create the tracking pull request to merge the new release branch to master. Need to update the PR_NUMBER after the tracking pull request is created.

# TFRS Pipelines

## Primary Pipelines

* dev-release.yaml (TFRS Dev release-2.9.0): the pipeline is automatically triggered when there is a commit to the release branch
* tfrs-release.yaml (TFRS release-2.9.0): the pipelin builds the release and deploy on Test and Prod, it needs to be manually triggered
* create-release.yaml (Create Release after merging to master): tag and create the release after merging release branch to master. The description of the tracking pull request becomes release notes

## Update .github/workflows/tfrs-release.yaml
* name
* branches
* PR_NUMBER
* RELEASE_NAME
## Other Pipelines

## Update .pipeline/lib/config.js
* const version
* releaseBranch
* cleanup-cron-workflow-runs.yaml (Scheduled cleanup old workflow runs): a cron job to cleanup the old workflows
* cleanup-workflow-runs.yaml (Cleanup old workflow runs): manually cleanup teh workflow runs

## Update frontend/package.json
* version
22 changes: 22 additions & 0 deletions .github/workflows/create-release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Create Release after merging to master
on:
pull_request:
types: [closed]
branches:
- 'master'

jobs:
create-release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Create Release
uses: softprops/action-gh-release@v1
with:
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 }}
draft: false
prerelease: false
8 changes: 4 additions & 4 deletions .github/workflows/dev-release.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
## For each release, the value of name, branches, RELEASE_NAME and PR_NUMBER need to be adjusted accordingly
## For each release, update lib/config.js: version and releaseBranch

name: TFRS Dev release-2.8.0
name: TFRS Dev release-2.9.0

on:
push:
branches: [ release-2.8.0 ]
branches: [ release-2.9.0 ]
paths:
- frontend/**
- backend/**
Expand All @@ -15,8 +15,8 @@ on:
env:
## The pull request number of the Tracking pull request to merge the release branch to main
## Also remember to update the version in .pipeline/lib/config.js
PR_NUMBER: 2384
RELEASE_NAME: release-2.8.0
PR_NUMBER: 2404
RELEASE_NAME: release-2.9.0

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/tfrs-release.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## For each release, the value of name, branches, RELEASE_NAME and PR_NUMBER need to be adjusted accordingly
## For each release, update lib/config.js: version and releaseBranch

name: TFRS release-2.8.0
name: TFRS release-2.9.0

on:
workflow_dispatch:
Expand All @@ -10,8 +10,8 @@ on:
env:
## The pull request number of the Tracking pull request to merge the release branch to main
## Also remember to update the version in .pipeline/lib/config.js
PR_NUMBER: 2384
RELEASE_NAME: release-2.8.0
PR_NUMBER: 2404
RELEASE_NAME: release-2.9.0

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
uses: trstringer/[email protected]
with:
secret: ${{ github.TOKEN }}
approvers: AlexZorkin,emi-hi,tim738745,kuanfandevops,jig-patel,prv-proton
approvers: AlexZorkin,emi-hi,tim738745,kuanfandevops,jig-patel,prv-proton,JulianForeman
minimum-approvals: 1
issue-title: "TFRS ${{ env.RELEASE_NAME }} Test Deployment"

Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:
uses: trstringer/[email protected]
with:
secret: ${{ github.TOKEN }}
approvers: AlexZorkin,kuanfandevops,tim738745
approvers: AlexZorkin,kuanfandevops,tim738745,jig-patel,prv-proton,JulianForeman
minimum-approvals: 2
issue-title: "TFRS ${{ env.RELEASE_NAME }} Prod Deployment"

Expand Down
4 changes: 2 additions & 2 deletions .pipeline/lib/config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';
const options= require('@bcgov/pipeline-cli').Util.parseArguments()
const changeId = options.pr //aka pull-request
const version = '2.8.0'
const version = '2.9.0'
const name = 'tfrs'
const ocpName = 'apps.silver.devops'

Expand All @@ -13,7 +13,7 @@ options.git.repository='tfrs'
const phases = {
build: { namespace:'0ab226-tools' , name: `${name}`, phase: 'build' , changeId:changeId, suffix: `-build-${changeId}` ,
instance: `${name}-build-${changeId}` , version:`${version}-${changeId}`, tag:`build-${version}-${changeId}`,
releaseBranch: 'release-2.8.0'
releaseBranch: 'release-2.9.0'
},
dev: {namespace:'0ab226-dev' , name: `${name}`, phase: 'dev' , changeId:changeId, suffix: `-dev` ,
instance: `${name}-dev` , version:`${version}`, tag:`dev-${version}`, dbServiceName: 'tfrs-spilo',
Expand Down
6 changes: 3 additions & 3 deletions backend/api/fixtures/test/test_compliance_reporting.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"update_timestamp": "2019-01-01",
"root_report": 1,
"latest_report": 1,
"traversal": 0
"traversal": 1
},
"model": "api.compliancereport",
"pk": 1
Expand All @@ -66,7 +66,7 @@
"update_timestamp": "2019-01-01",
"root_report": 2,
"latest_report": 2,
"traversal": 0
"traversal": 1
},
"model": "api.compliancereport",
"pk": 2
Expand All @@ -87,7 +87,7 @@
"update_timestamp": "2019-01-01",
"root_report": 3,
"latest_report": 3,
"traversal": 0
"traversal": 1
},
"model": "api.compliancereport",
"pk": 3
Expand Down
Loading

0 comments on commit be06494

Please sign in to comment.