Remove unnecessary variables from Makefiles #20620
Open
+18
−54
Conversation
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
1. Makefile
- Remove -e option since it is unnecessary when passing variables as
command line arguments to `make -f make/photon/Makefile`.
(The -e option is used to override variables defined in the Makefile
with environment variables.)
- Remove DEVFLAG and REGISTRYVERSION from `make -f make/photon/Makefile`
command line arguments since they are unused in make/photon/Makefile.
- Add TRIVYFLAG to `make -f make/photon/Makefile` command line argument
since it is used in make/photon/Makefile.
Strictly speaking, this argument is unnecessary, but it is better to
have it to explicitly indicate that make/photon/Makefile also uses
this variable.
- Remove the variable definitions since the following variables are unused.
- CONFIGPATH
- CORE_PATH
- DEVFLAG
- DOCKERFILEPATH_COMMON
- GOBUILD
- GOBUILDMAKEPATH_EXPORTER
- GOBUILDPATH_EXPORTER
- GOCLEAN
- GOCMD
- GODEP
- GOFMT
- GOINSTALL
- GOTEST
- PORTAL_PATH
- PREPAREPATH
- SRCPATH
- ZIPCMD
2. make/photon/Makefile
- Remove the variable definitions since the following variables are unused.
- CORE_BINARYNAME
- CORE_SOURCECODE
- DOCKERFILENAME_POSTGRESQL
- DOCKERFILEPATH_POSTGRESQL
- DOCKERIMAGENAME_POSTGRESQL
- DOCKERIMAGES
- JOBSERVICEBINARYNAME
- JOBSERVICESOURCECODE
- POSTGRESQL
- SEDCMD
- SRCPATH
- TOOLSPATH
- WGET
- Remove the variable definitions since the following variables are
specified as command line arguments when executed from Makefile.
- BASEIMAGENAMESPACE
- IMAGENAMESPACE
Signed-off-by: Mitsuru Kariya <mitsuru.kariya@nttdata.com>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #20620 +/- ##
===========================================
+ Coverage 45.36% 66.16% +20.80%
===========================================
Files 244 1048 +804
Lines 13333 114471 +101138
Branches 2719 2856 +137
===========================================
+ Hits 6049 75745 +69696
- Misses 6983 34580 +27597
- Partials 301 4146 +3845
Flags with carried forward coverage won't be shown. Click here to find out more. |
Fix make argument to be executed in the recipe for build_standalone_db_migrator. Signed-off-by: Mitsuru Kariya <mitsuru.kariya@nttdata.com>
|
Sorry, I realized I forgot to fix build_standalone_db_migrator target, so I fixed it and pushed. |
wy65701436
reviewed
Jul 31, 2024
| @@ -21,20 +17,11 @@ DOCKERCMD=$(shell which docker) | |||
| DOCKERBUILD=$(DOCKERCMD) build --no-cache | |||
| DOCKERBUILD_WITH_PULL_PARA=$(DOCKERBUILD) --pull=$(PULL_BASE_FROM_DOCKERHUB) | |||
| DOCKERRMIMAGE=$(DOCKERCMD) rmi | |||
| DOCKERIMAGES=$(DOCKERCMD) images | |||
There was a problem hiding this comment.
keep them as a default value?
Signed-off-by: Mitsuru Kariya <mitsuru.kariya@nttdata.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Comprehensive Summary of your change
MakefileRemove
-eoption since it is unnecessary when passing variables as command line arguments tomake -f make/photon/Makefile. (The-eoption is used to override variables defined in theMakefilewith environment variables.)Remove
DEVFLAGandREGISTRYVERSIONfrommake -f make/photon/Makefilecommand line arguments since they are unused inmake/photon/Makefile.Add
TRIVYFLAGtomake -f make/photon/Makefilecommand line argument since it is used inmake/photon/Makefile. Strictly speaking, this argument is unnecessary, but it is better to have it to explicitly indicate thatmake/photon/Makefilealso uses this variable.Remove the variable definitions since the following variables are unused.
CONFIGPATHCORE_PATHDEVFLAGDOCKERFILEPATH_COMMONGOBUILDGOBUILDMAKEPATH_EXPORTERGOBUILDPATH_EXPORTERGOCLEANGOCMDGODEPGOFMTGOINSTALLGOTESTPORTAL_PATHPREPAREPATHSRCPATHZIPCMDmake/photon/MakefileRemove the variable definitions since the following variables are unused.
CORE_BINARYNAMECORE_SOURCECODEDOCKERFILENAME_POSTGRESQLDOCKERFILEPATH_POSTGRESQLDOCKERIMAGENAME_POSTGRESQLDOCKERIMAGESJOBSERVICEBINARYNAMEJOBSERVICESOURCECODEPOSTGRESQLSEDCMDSRCPATHTOOLSPATHWGETRemove the variable definitions since the following variables are specified as command line arguments when executed from
Makefile.BASEIMAGENAMESPACEIMAGENAMESPACEIssue being fixed
Please indicate you've done the following: