Commit 52f6a85 1 parent 1242e71 commit 52f6a85 Copy full SHA for 52f6a85
File tree 3 files changed +4
-9
lines changed
3 files changed +4
-9
lines changed Original file line number Diff line number Diff line change @@ -6,9 +6,6 @@ if [[ -z "${WORKSPACE-""}" ]]; then
6
6
WORKSPACE=$( git rev-parse --show-toplevel)
7
7
export WORKSPACE
8
8
fi
9
- if [[ -z " ${SETUP_MAGE_VERSION-" " } " ]]; then
10
- SETUP_MAGE_VERSION=" 1.15.0"
11
- fi
12
9
if [[ -z " ${SETUP_GVM_VERSION-" " } " ]]; then
13
10
SETUP_GVM_VERSION=" v0.5.2" # https://github.com/andrewkroh/gvm/issues/44#issuecomment-1013231151
14
11
fi
@@ -54,7 +51,6 @@ mage() {
54
51
go version
55
52
if ! [ -x " $( type -P mage | sed ' s/mage is //g' ) " ];
56
53
then
57
- echo " installing mage ${SETUP_MAGE_VERSION} "
58
54
make mage
59
55
fi
60
56
pushd " $WORKSPACE "
Original file line number Diff line number Diff line change @@ -7,11 +7,11 @@ ARG AGENT_IMAGE="docker.elastic.co/beats/elastic-agent"
7
7
FROM ${crossbuild_image}:${GO_VERSION}-main-debian8 as build
8
8
ARG DEV="true"
9
9
ARG SNAPSHOT="true"
10
- RUN go install github.com/magefile/mage@v1.15.0
11
10
WORKDIR /elastic-agent/
12
11
COPY go.mod go.sum /elastic-agent/
13
12
RUN go mod download
14
13
COPY . /elastic-agent/
14
+ RUN go install github.com/magefile/mage
15
15
RUN mage golangcrossBuild
16
16
RUN git rev-parse HEAD | cut -c 1-6 > .build_hash.txt
17
17
Original file line number Diff line number Diff line change @@ -3,7 +3,6 @@ COVERAGE_DIR=$(BUILD_DIR)/coverage
3
3
BEATS? =elastic-agent
4
4
PROJECTS = $(BEATS )
5
5
PYTHON_ENV? =$(BUILD_DIR ) /python-env
6
- MAGE_VERSION ?= v1.15.0
7
6
MAGE_PRESENT := $(shell mage --version 2> /dev/null | grep $(MAGE_VERSION ) )
8
7
MAGE_IMPORT_PATH ?= github.com/magefile/mage
9
8
export MAGE_IMPORT_PATH
@@ -12,11 +11,11 @@ export MAGE_IMPORT_PATH
12
11
.PHONY : mage
13
12
mage :
14
13
ifndef MAGE_PRESENT
15
- @echo Installing mage $(MAGE_VERSION) .
16
- @go install ${MAGE_IMPORT_PATH}@$(MAGE_VERSION)
14
+ @echo Installing mage.
15
+ @go install ${MAGE_IMPORT_PATH}
17
16
@-mage -clean
18
17
else
19
- @echo Mage $(MAGE_VERSION) already installed.
18
+ @echo Mage already installed.
20
19
endif
21
20
22
21
# # help : Show this help.
You can’t perform that action at this time.
0 commit comments