Skip to content

Commit

Permalink
Revert "chore(build): remove grunt and add makefile [EE-4824] (#8803)"
Browse files Browse the repository at this point in the history
This reverts commit 5fd36ee.
  • Loading branch information
hookenz authored and prabhat83 committed May 22, 2023
1 parent 292e525 commit 86095e1
Show file tree
Hide file tree
Showing 7 changed files with 452 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ exclude_patterns:
- api/
- "!app/kubernetes/**"
- .github/
- .tmp/
- .tmp/
2 changes: 1 addition & 1 deletion .github/workflows/validate-openapi-spec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ jobs:
# OAS3.0 however does support multiple body params - hence its best to convert the generated OAS 2.0
# to OAS 3.0 and validate the output of generated OAS 3.0 instead.
- name: Convert OpenAPI 2.0 to OpenAPI 3.0 and validate spec
run: yarn validate:docs
run: yarn validate:docs
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ else
build_all 'linux-amd64 linux-arm linux-arm64 linux-ppc64le linux-s390x darwin-amd64 windows-amd64'
exit 0
fi
fi
fi
4 changes: 4 additions & 0 deletions build/build_binary.ps1
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
param (
[string]$platform,
[string]$arch
)

$ErrorActionPreference = "Stop";

Expand Down
17 changes: 6 additions & 11 deletions build/build_binary.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@

set -x

DEBUG=${DEBUG:-""}
if [ -n "$DEBUG" ]; then
set -x
fi

mkdir -p dist

# populate tool versions
Expand All @@ -27,14 +22,14 @@ go get -t -d -v ./...

# the build takes 2 seconds
GOOS=$1 GOARCH=$2 CGO_ENABLED=0 go build \
-trimpath \
--installsuffix cgo \
--ldflags "-s \
-trimpath \
--installsuffix cgo \
--ldflags "-s \
--X 'github.com/portainer/portainer/api/build.BuildNumber=${BUILDNUMBER}' \
--X 'github.com/portainer/portainer/api/build.ImageTag=${CONTAINER_IMAGE_TAG}' \
--X 'github.com/portainer/portainer/api/build.NodejsVersion=${NODE_VERSION}' \
--X 'github.com/portainer/portainer/api/build.YarnVersion=${YARN_VERSION}' \
--X 'github.com/portainer/portainer/api/build.WebpackVersion=${WEBPACK_VERSION}' \
--X 'github.com/portainer/portainer/api/build.GoVersion=${GO_VERSION}'" \
-o "../dist/portainer" \
./cmd/portainer/
--X 'github.com/portainer/portainer/api/build.GoVersion=${GO_VERSION}'" \
-o "../dist/portainer" \
./cmd/portainer/
2 changes: 0 additions & 2 deletions go.work.sum

This file was deleted.

Loading

0 comments on commit 86095e1

Please sign in to comment.