From 31434ca7044ff8865b39d2b6bb51a83dc0651282 Mon Sep 17 00:00:00 2001 From: Chris Ditcher Date: Wed, 26 Jun 2024 09:42:52 -0700 Subject: [PATCH 1/8] Update build.from.developer.branch.deploy.to.dev.yml Updated to ubuntu-22.04 --- .../workflows/build.from.developer.branch.deploy.to.dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.from.developer.branch.deploy.to.dev.yml b/.github/workflows/build.from.developer.branch.deploy.to.dev.yml index 03bae86a..76ad8274 100644 --- a/.github/workflows/build.from.developer.branch.deploy.to.dev.yml +++ b/.github/workflows/build.from.developer.branch.deploy.to.dev.yml @@ -48,7 +48,7 @@ on: jobs: openshift-ci-cd: name: Build and deploy to OpenShift DEV from developer branch - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 environment: dev steps: @@ -152,4 +152,4 @@ jobs: - name: ZAP Scan uses: zaproxy/action-api-scan@v0.7.0 with: - target: 'https://${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}.apps.silver.devops.gov.bc.ca/api/v1/api-docs' \ No newline at end of file + target: 'https://${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}.apps.silver.devops.gov.bc.ca/api/v1/api-docs' From b93810186f4baed68210603c9c3c0e278e35bc11 Mon Sep 17 00:00:00 2001 From: Chris Ditcher Date: Wed, 26 Jun 2024 09:43:13 -0700 Subject: [PATCH 2/8] Update build.from.main.branch.deploy.to.dev.yml Updated to ubuntu-22.04 --- .github/workflows/build.from.main.branch.deploy.to.dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.from.main.branch.deploy.to.dev.yml b/.github/workflows/build.from.main.branch.deploy.to.dev.yml index 245fd947..c699517a 100644 --- a/.github/workflows/build.from.main.branch.deploy.to.dev.yml +++ b/.github/workflows/build.from.main.branch.deploy.to.dev.yml @@ -36,7 +36,7 @@ on: jobs: openshift-ci-cd: name: Build and deploy to OpenShift DEV - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 environment: dev steps: @@ -138,4 +138,4 @@ jobs: - name: ZAP Scan uses: zaproxy/action-api-scan@v0.7.0 with: - target: 'https://${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}.apps.silver.devops.gov.bc.ca/api/v1/api-docs' \ No newline at end of file + target: 'https://${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}.apps.silver.devops.gov.bc.ca/api/v1/api-docs' From 195a5ee24d83874798101fa400022aed91e32321 Mon Sep 17 00:00:00 2001 From: Chris Ditcher Date: Wed, 26 Jun 2024 09:43:38 -0700 Subject: [PATCH 3/8] Update build.from.release.branch.deploy.to.dev.yml Updated to ubuntu-22.04 --- .github/workflows/build.from.release.branch.deploy.to.dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.from.release.branch.deploy.to.dev.yml b/.github/workflows/build.from.release.branch.deploy.to.dev.yml index 94b47a1e..10340f88 100644 --- a/.github/workflows/build.from.release.branch.deploy.to.dev.yml +++ b/.github/workflows/build.from.release.branch.deploy.to.dev.yml @@ -43,7 +43,7 @@ on: jobs: openshift-ci-cd: name: Build and deploy to OpenShift DEV from release branch - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 environment: dev steps: @@ -147,4 +147,4 @@ jobs: - name: ZAP Scan uses: zaproxy/action-api-scan@v0.7.0 with: - target: 'https://${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}.apps.silver.devops.gov.bc.ca/api/v1/api-docs' \ No newline at end of file + target: 'https://${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}.apps.silver.devops.gov.bc.ca/api/v1/api-docs' From 6c55f95928b319184c417552baf190475160c79f Mon Sep 17 00:00:00 2001 From: Chris Ditcher Date: Wed, 26 Jun 2024 09:43:55 -0700 Subject: [PATCH 4/8] Update create_tag.yml Updated to ubuntu-22.04 --- .github/workflows/create_tag.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create_tag.yml b/.github/workflows/create_tag.yml index 28501b26..5cb372dc 100644 --- a/.github/workflows/create_tag.yml +++ b/.github/workflows/create_tag.yml @@ -26,7 +26,7 @@ on: jobs: tag_image: name: Tag Image - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 environment: dev outputs: @@ -62,4 +62,4 @@ jobs: oc login --token=${{ env.OPENSHIFT_TOKEN }} --server=${{ env.OPENSHIFT_SERVER }} oc project ${{ env.OPENSHIFT_NAMESPACE }} - oc tag ${{ env.NAMESPACE }}-dev/${{ env.REPO_NAME }}:latest ${{ env.NAMESPACE }}-dev/${{ env.REPO_NAME }}:${{ github.event.inputs.version }} \ No newline at end of file + oc tag ${{ env.NAMESPACE }}-dev/${{ env.REPO_NAME }}:latest ${{ env.NAMESPACE }}-dev/${{ env.REPO_NAME }}:${{ github.event.inputs.version }} From 46cdf7d691df8383fc6d10efb1c2353d7ce89a76 Mon Sep 17 00:00:00 2001 From: Chris Ditcher Date: Wed, 26 Jun 2024 09:44:12 -0700 Subject: [PATCH 5/8] Update deploy_prod.yml Updated to ubuntu-22.04 --- .github/workflows/deploy_prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_prod.yml b/.github/workflows/deploy_prod.yml index a40b6f19..b560d339 100644 --- a/.github/workflows/deploy_prod.yml +++ b/.github/workflows/deploy_prod.yml @@ -32,7 +32,7 @@ on: jobs: deploy-to-openshift-prod: name: Deploy to OpenShift PROD - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 environment: prod outputs: From 8fecbc44a5ee27cc1ab802a5ecf7c77dcf6aad5b Mon Sep 17 00:00:00 2001 From: Chris Ditcher Date: Wed, 26 Jun 2024 09:44:27 -0700 Subject: [PATCH 6/8] Update deploy_test.yml Updated to ubuntu-22.04 --- .github/workflows/deploy_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_test.yml b/.github/workflows/deploy_test.yml index 77ff60a4..98612daf 100644 --- a/.github/workflows/deploy_test.yml +++ b/.github/workflows/deploy_test.yml @@ -32,7 +32,7 @@ on: jobs: deploy-to-openshift-test: name: Deploy to OpenShift TEST - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 environment: test outputs: From 040d160066b80276cc540d7d8fc64a0a014d7d78 Mon Sep 17 00:00:00 2001 From: Chris Ditcher Date: Wed, 26 Jun 2024 09:44:44 -0700 Subject: [PATCH 7/8] Update on.pr.yml Updated to ubuntu-22.04 --- .github/workflows/on.pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/on.pr.yml b/.github/workflows/on.pr.yml index 2eae9936..4c1f2c15 100644 --- a/.github/workflows/on.pr.yml +++ b/.github/workflows/on.pr.yml @@ -10,7 +10,7 @@ on: jobs: quality_profile: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 defaults: run: From 2fa17fdb73c14af868ddf474e00eb6bdfc0f9fe3 Mon Sep 17 00:00:00 2001 From: Jinil Sung Date: Wed, 24 Jul 2024 10:28:05 -0700 Subject: [PATCH 8/8] GRAD2-2799: fixed the issue on GPA calculation due to the wrong order of student courses. GRAD2-2799: fixed the issue on GPA calculation due to the wrong order of student courses. --- .../api/ruleengine/rule/RegistrationsDuplicateCrseRule.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/RegistrationsDuplicateCrseRule.java b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/RegistrationsDuplicateCrseRule.java index 93c91a4a..dadedeff 100644 --- a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/RegistrationsDuplicateCrseRule.java +++ b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/RegistrationsDuplicateCrseRule.java @@ -38,8 +38,6 @@ public RuleData fire() { boolean isCompletedCourse1 = false; boolean isCompletedCourse2 = false; - studentCourseList.sort(Comparator.comparing(StudentCourse::getCourseCode)); - for (int i = 0; i < studentCourseList.size() - 1; i++) { for (int j = i + 1; j < studentCourseList.size(); j++) { if (studentCourseList.get(i).getCourseCode().equals(studentCourseList.get(j).getCourseCode())