-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Tracking pull request to merge release-1.64.0 to master (#2328)
* Update package.json 1.64.0 * fix: 2274 - permissions (#2300) * set default permissions to AllowNone * Chore/2267 - remove commentator's name (#2320) * chore: removes get_serializer_context * -refactors mixin and updates the files that use it -adds extra check to credit transfers details page * chore: removes commented code * chore: adds mixin to sales submission list serializer so it passes test -------- Co-authored-by: tim738745 <[email protected]> * feat: 2324 - add legacy column (#2340) * feat: 2266 - reassessments (#2334) * 2313 Endpoint testing (#2341) * chore: tests for user deetails and update * checks for is government before displaying supplier details page (idir view) * chore: organization tests tasks: some changes to organization viewset , adds permissions fix: adds check for is government on user viewset for download_active * chore: 2313 - small changes (#2342) * testing: credit requests (#2343) * fix: adds user id to basic mixin so comments can be edited chore: testing * removing extra lines * space * revert: 2324 - legacy column (#2350) * fix: 2351 - ICBC file upload error (#2352) * fix: updates credit agreement alert to use displayname (#2354) fix: grabs supplementary comments also using supplementary id instead of just reassessment id chore: adds empty strings to default value in user details form so there are no console errors if there are blank fields --------- Co-authored-by: tim738745 <[email protected]> Co-authored-by: Emily <[email protected]> Co-authored-by: tim738745 <[email protected]>
- Loading branch information
1 parent
50f3437
commit c14cd42
Showing
78 changed files
with
1,118 additions
and
1,991 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
name: Scheduled cleanup old workflow runs | ||
name: Cleanup old workflow runs (scheduled) | ||
on: | ||
schedule: | ||
- cron: '0 0 * * 0' | ||
- cron: "0 0 * * 0" | ||
# At 00:00 on Sunday. | ||
|
||
jobs: | ||
|
@@ -11,9 +11,9 @@ jobs: | |
actions: write | ||
steps: | ||
- name: Delete workflow runs | ||
uses: Mattraks/[email protected].4 | ||
uses: Mattraks/[email protected].6 | ||
with: | ||
token: ${{ github.token }} | ||
repository: ${{ github.repository }} | ||
retain_days: 15 | ||
keep_minimum_runs: 10 | ||
keep_minimum_runs: 10 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,11 +3,11 @@ on: | |
workflow_dispatch: | ||
inputs: | ||
days: | ||
description: 'Number of days.' | ||
description: "Number of days." | ||
required: true | ||
default: 15 | ||
minimum_runs: | ||
description: 'The minimum runs to keep for each workflow.' | ||
description: "The minimum runs to keep for each workflow." | ||
required: true | ||
default: 10 | ||
jobs: | ||
|
@@ -17,7 +17,7 @@ jobs: | |
actions: write | ||
steps: | ||
- name: Delete workflow runs | ||
uses: Mattraks/[email protected].4 | ||
uses: Mattraks/[email protected].6 | ||
with: | ||
token: ${{ github.token }} | ||
repository: ${{ github.repository }} | ||
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,7 +9,7 @@ on: | |
|
||
env: | ||
GH_TOKEN: ${{ github.token }} | ||
|
||
jobs: | ||
verify-pr: | ||
name: Verify pull request title started with Tracking | ||
|
@@ -42,20 +42,21 @@ jobs: | |
id: tag_name | ||
with: | ||
source: ${{ github.event.pull_request.head.ref }} | ||
find: 'release-' | ||
replace: 'v' | ||
find: "release-" | ||
replace: "v" | ||
|
||
- name: Checkout repository | ||
uses: actions/[email protected] | ||
with: | ||
ref: master | ||
|
||
- name: Create Release | ||
uses: softprops/[email protected] | ||
- name: Github Release | ||
uses: elgohr/Github-Release-Action@v5 | ||
env: | ||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
with: | ||
name: ${{ steps.tag_name.outputs.value }} | ||
tag_name: ${{ steps.tag_name.outputs.value }} | ||
target_commitish: master | ||
body: | | ||
${{ github.event.pull_request.body }} | ||
token: ${{ env.GITHUB_TOKEN }} | ||
draft: false | ||
prerelease: false | ||
title: ${{ steps.tag_name.outputs.value }} | ||
tag: ${{ steps.tag_name.outputs.value }} | ||
|
||
- name: Get Current Default Branch and Set Tag Name | ||
id: get_default_branch | ||
|
@@ -64,7 +65,7 @@ jobs: | |
current_default_branch=$(gh api repos/${{ github.repository }} | jq -r '.default_branch') | ||
echo "Current default branch is: $current_default_branch" | ||
echo "current_default_branch=$current_default_branch" >> $GITHUB_OUTPUT | ||
# # Extract the current release version number (assumes format is release-X.Y.Z) | ||
# current_version=$(echo "$current_default_branch" | grep -oP '\d+\.\d+\.\d+') | ||
# echo "Current version extracted: $current_version" | ||
|
@@ -78,10 +79,10 @@ jobs: | |
run: | | ||
# Get the current default branch from the previous step | ||
current_default_branch="${{ steps.get_default_branch.outputs.current_default_branch }}" | ||
# Extract the current release version number (assumes format is release-X.Y.Z) | ||
current_version=$(echo "$current_default_branch" | grep -oP '\d+\.\d+\.\d+') | ||
# Increment the minor version (X.Y.Z -> X.(Y+1).0) | ||
major_version=$(echo "$current_version" | cut -d. -f1) | ||
minor_version=$(echo "$current_version" | cut -d. -f2) | ||
|
@@ -90,21 +91,16 @@ jobs: | |
# Increment the minor version by 1 for the new release branch | ||
new_minor_version=$((minor_version + 1)) | ||
new_release_branch="release-${major_version}.${new_minor_version}.0" | ||
echo "New release branch will be: $new_release_branch" | ||
echo "new_release_branch=$new_release_branch" >> $GITHUB_OUTPUT | ||
- name: Checkout repository | ||
uses: actions/[email protected] | ||
with: | ||
ref: master | ||
|
||
- name: Create New Release Branch | ||
id: create_new_release_branch | ||
run: | | ||
# Get the new release branch name from the previous step | ||
new_release_branch="${{ steps.get_new_release_branch.outputs.new_release_branch }}" | ||
# Create the new branch from master | ||
git checkout -b $new_release_branch master | ||
git push origin $new_release_branch |
Oops, something went wrong.