Skip to content

Commit

Permalink
Fix format-diff error problem (#2345)
Browse files Browse the repository at this point in the history
* fix: checkout cargo.lock file

Signed-off-by: hlts2 <hiroto.funakoshi.hiroto@gmail.com>

* fix: investigate docekr build for agent

Signed-off-by: hlts2 <hiroto.funakoshi.hiroto@gmail.com>

* fix: go build error for license

Signed-off-by: hlts2 <hiroto.funakoshi.hiroto@gmail.com>

* fix: go run error

Signed-off-by: hlts2 <hiroto.funakoshi.hiroto@gmail.com>

* fix: targetplatform to buildplatform

Signed-off-by: hlts2 <hiroto.funakoshi.hiroto@gmail.com>

* fix: revert platform configuration

Signed-off-by: hlts2 <hiroto.funakoshi.hiroto@gmail.com>

* fix: revert ci container image tag

Signed-off-by: hlts2 <hiroto.funakoshi.hiroto@gmail.com>

---------

Signed-off-by: hlts2 <hiroto.funakoshi.hiroto@gmail.com>
  • Loading branch information
hlts2 committed Feb 13, 2024
1 parent 605fc10 commit 852de6a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Run formatter and license.go
run: |
make format
git checkout go.mod go.sum
git checkout go.mod go.sum ./rust/Cargo.lock
- name: Check and Push to main branch
continue-on-error: true
run: |
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
run: |
make deps/install
make format
git checkout go.mod go.sum
git checkout go.mod go.sum ./rust/Cargo.lock
- name: Check format difference
run: |
if git diff --quiet --exit-code; then
Expand Down
6 changes: 1 addition & 5 deletions Makefile.d/functions.mk
Original file line number Diff line number Diff line change
Expand Up @@ -279,15 +279,11 @@ define gen-go-option-test-sources
endef

define gen-license
BIN_PATH="$(TEMP_DIR)/vald-helm-schema-gen"
rm -rf $$BIN_PATH
MAINTAINER=$2 \
GOPRIVATE=$(GOPRIVATE) \
GOARCH=$(GOARCH) \
GOOS=$(GOOS) \
go build -mod=readonly -a -o $$BIN_PATH $(ROOTDIR)/hack/license/gen/main.go
$$BIN_PATH $1
rm -rf $$BIN_PATH
go run -mod=readonly $(ROOTDIR)/hack/license/gen/main.go $1
endef

define gen-vald-helm-schema
Expand Down

0 comments on commit 852de6a

Please sign in to comment.