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.

Sign up for GitHub

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

build-rpms: Use common target to build rpms #66

Merged
merged 1 commit into from
Jul 23, 2024
Merged

build-rpms: Use common target to build rpms #66

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions jobs/scripts/nightly-samba-builds/nightly-samba-builds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,8 @@ then

fi

if [[ "${PLATFORM}" = "fedora" ]]
then
make "rpms.fedora" "vers=${VERSION}" "refspec=${SAMBA_BRANCH}"
make "test.rpms.fedora" "vers=${VERSION}" "refspec=${SAMBA_BRANCH}"
else
make "rpms.${PLATFORM}${VERSION}" "refspec=${SAMBA_BRANCH}"
make "test.rpms.${PLATFORM}${VERSION}" "refspec=${SAMBA_BRANCH}"
fi
make "rpms.${PLATFORM}" "vers=${VERSION}" "refspec=${SAMBA_BRANCH}"
make "test.rpms.${PLATFORM}" "vers=${VERSION}" "refspec=${SAMBA_BRANCH}"
Copy link
Collaborator

Choose a reason for hiding this comment

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

I was expecting to see make rpms.${PLARFORM} instead of an if/else branching.
Doesn't keeping the if/else branch defeat the purpose of this PR and the preparatory samba-build PR?

I suggest to remove the if-else branch and only use make rpms.${PLATFORM} directly.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I was not looking right, confused removal with addition. forget this review...


# Don't upload the artifacts if running on a PR.
if [ -n "${ghprbPullId}" ]
Expand Down
Loading