Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DWN-37110: CCI migration openid-connect-server #15

Merged
merged 8 commits into from
Apr 1, 2021

Conversation

sivaschuck
Copy link
Collaborator

No description provided.

Copy link
Collaborator

@hsmith-gresham hsmith-gresham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couple of minor points, nothing blocking

fi

BRANCH=1.3.x

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why isn't the branch check in here like with CashProof and MarketFacingData?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, on CP and MFD the branch check was to make sure you were on master before triggering release as that branch would then be inserted into the curl command. This time I inserted 1.3.x into the curl straight away, so the check is no longer necessary as no matter what branch you're on when running the script it will always trigger release build on 1.3.x

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, makes sense, why didn't we do what's done here on MF and Proof?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sensible ideas don't all come to me at once 🤷‍♂️

Comment on lines 41 to 51
VERSION=$(mvn -s gresham-nexus-settings/ctc.plugins.settings.xml -Dexec.executable='echo' -Dexec.args='${project.version}' --non-recursive exec:exec -q)
if [[ "${CIRCLE_BRANCH}" != "${MASTER_BRANCH}" && "${VERSION}" == *-SNAPSHOT ]]; then
# if on feature branch
REPOSITORY=altSnapshotDeploymentRepository=snapshots::default::https://nexus.greshamtech.com/repository/thirdparty-maven-snapshots/
elif [[ "${CIRCLE_BRANCH}" == "${MASTER_BRANCH}" && "${VERSION}" == *-SNAPSHOT ]]; then
# if on 1.3.x but snapshot
REPOSITORY=altSnapshotDeploymentRepository=snapshots::default::https://nexus.greshamtech.com/repository/thirdparty-maven-snapshots/
elif [[ "${CIRCLE_BRANCH}" == "${MASTER_BRANCH}" && "${VERSION}" != *-SNAPSHOT ]]; then
# if on 1.3.x but not snapshot (i.e building a release)
REPOSITORY=altReleaseDeploymentRepository=releases::default::https://nexus.greshamtech.com/repository/thirdparty-maven-releases/
fi
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this be simplified to be thirdparty-maven-snapshots by default and then only change when releasing?

@asheppard-gresham
Copy link

@ikaoullas I think you had some 'fun' in this repo recently trying to do a patch? I don't know if you are interested in looking or whether you are aware of any gotchas that we might want to sort whilst switching to Circle?

@ikaoullas
Copy link

@ikaoullas I think you had some 'fun' in this repo recently trying to do a patch? I don't know if you are interested in looking or whether you are aware of any gotchas that we might want to sort whilst switching to Circle?

I don't recall updating the patch strategy for this repo. I only changed clareti-auth and clareti-common-security

@sivaschuck sivaschuck merged commit f443981 into 1.3.x Apr 1, 2021
@asheppard-gresham asheppard-gresham deleted the DWN-37110_cci_migration branch April 1, 2021 13:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants