Skip to content

Commit

Permalink
Merge pull request #1514 from jumpserver/pr@dev@perf_makefile
Browse files Browse the repository at this point in the history
perf: update Makefile
  • Loading branch information
wojiushixiaobai authored Sep 19, 2024
2 parents 5973302 + e781c12 commit 767644f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
name: golangci-lint
on:
pull_request:
push:
branches:
- dev
pull_request:

permissions:
contents: read
# Optional: allow read access to pull request. Use with `only-new-issues` option.
# pull-requests: read

jobs:
golangci:
name: lint
Expand Down
4 changes: 2 additions & 2 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ archives:
format_overrides:
- goos: windows
format: zip
name_template: "{{ .ProjectName }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}"
name_template: "{{ .ProjectName }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}{{- if .Arm }}v{{ .Arm }}{{ end }}"

checksum:
name_template: "{{ .ProjectName }}_checksums.txt"
Expand All @@ -105,7 +105,7 @@ release:
mode: append
extra_files:
- glob: dist/*.tar.gz
- glob: dist/{{ .ProjectName }}_checksums.txt
- glob: dist/*.txt
name_template: "Release {{.Tag}}"

changelog:
Expand Down
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@ VERSION ?= Unknown
BuildTime := $(shell date -u '+%Y-%m-%d %I:%M:%S%p')
COMMIT := $(shell git rev-parse HEAD)
GOVERSION := $(shell go version)
CipherKey := $(shell head -c 100 /dev/urandom | base64 | head -c 32)

BASEPATH := $(shell pwd)
KOKOSRCFILE := $(BASEPATH)/cmd/koko/
KUBECTLFILE := $(BASEPATH)/cmd/kubectl/
HELMFILE := $(BASEPATH)/cmd/helm/

COMMIT := $(shell git rev-parse HEAD)
GOVERSION := $(shell go version)
CipherKey := $(shell head -c 100 /dev/urandom | base64 | head -c 32)
TARGETARCH ?= amd64

GOOS := $(shell go env GOOS)
GOARCH := $(shell go env GOARCH)

Expand Down

0 comments on commit 767644f

Please sign in to comment.