Skip to content

Commit

Permalink
removed setup-script job
Browse files Browse the repository at this point in the history
Signed-off-by: danish9039 <danishsiddiqui040@gmail.com>
  • Loading branch information
danish9039 committed Jan 28, 2025
1 parent 7fd5068 commit 7c18c1a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 17 deletions.
9 changes: 0 additions & 9 deletions .github/workflows/ci-lint-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,7 @@ permissions:
contents: read

jobs:
setup-scripts:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Setup lint scripts
run: make setup-scripts


lint:
needs: setup-scripts
runs-on: ubuntu-latest
steps:
- uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7
Expand Down
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -194,14 +194,6 @@ define proto_compile

endef

.PHONY: setup-scripts
setup-scripts:
rm -rf .scripts/lint
mkdir -p .scripts/lint
curl -o .scripts/lint/updateLicense.py https://raw.githubusercontent.com/jaegertracing/jaeger/main/scripts/lint/updateLicense.py
curl -o .scripts/lint/import-order-cleanup.py https://raw.githubusercontent.com/jaegertracing/jaeger/main/scripts/lint/import-order-cleanup.py
chmod +x .scripts/lint/*.py

.PHONY: lint
lint: lint-imports lint-nocommit lint-license lint-go

Expand All @@ -212,7 +204,12 @@ lint-go: $(LINT)
.PHONY: lint-license
lint-license:
@echo Verifying that all files have license headers
@mkdir -p .scripts/lint
@curl -s -o .scripts/lint/updateLicense.py https://raw.githubusercontent.com/jaegertracing/jaeger/main/scripts/lint/updateLicense.py
@chmod +x .scripts/lint/updateLicense.py
@./.scripts/lint/updateLicense.py $(ALL_SRC) $(SCRIPTS_SRC) > $(FMT_LOG)
@[ -s "$(FMT_LOG)" ] || echo "✅ All files have license headers"


.PHONY: lint-nocommit
lint-nocommit:
Expand All @@ -224,6 +221,9 @@ lint-nocommit:
.PHONY: lint-imports
lint-imports:
@echo Verifying that all files have correctly ordered imports
@mkdir -p .scripts/lint
@curl -s -o .scripts/lint/import-order-cleanup.py https://raw.githubusercontent.com/jaegertracing/jaeger/main/scripts/lint/import-order-cleanup.py
@chmod +x .scripts/lint/import-order-cleanup.py
@./.scripts/lint/import-order-cleanup.py -o stdout -t $(ALL_SRC) > $(IMPORT_LOG)
@[ ! -s "$(IMPORT_LOG)" ] || (echo "Import ordering failures, run 'make fmt'" | cat - $(IMPORT_LOG) && false)
@[ -s "$(IMPORT_LOG)" ] || echo "✅ All files have correctly ordered imports"
Expand Down

0 comments on commit 7c18c1a

Please sign in to comment.