Skip to content

Commit

Permalink
switch dir
Browse files Browse the repository at this point in the history
  • Loading branch information
criemen committed Oct 21, 2024
1 parent 5c5084a commit 99547ee
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 65 deletions.
1 change: 1 addition & 0 deletions .github/workflows/go-tests-other-os.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
- name: dump env bash
shell: bash
run: |
cd go
where bazel
declare -px
bazel version
Expand Down
66 changes: 1 addition & 65 deletions go/Makefile
Original file line number Diff line number Diff line change
@@ -1,69 +1,5 @@
all: gen extractor

EXTRACTOR_PACK_OUT = extractor-pack

.PHONY: extractor gen clean autoformat check-formatting

clean:
rm -rf $(EXTRACTOR_PACK_OUT) build/stats build/testdb

autoformat:
find ql -iregex '.*\.qll?' -print0 | xargs -0 codeql query format -qq -i
find . -path '**/vendor' -prune -or -type f -iname '*.go' ! -empty -print0 | xargs -0 grep -L "//\s*autoformat-ignore" | xargs gofmt -w

check-formatting:
@output=$$(find . -path '**/vendor' -prune -or -type f -iname '*.go' ! -empty -print0 | xargs -0 grep -L "//\s*autoformat-ignore" | xargs gofmt -l 2>&1); \
if [ -n "$$output" ]; then \
echo "The following files need to be reformatted using gofmt or have compilation errors:"; \
echo "$$output"; \
fi; \
test -z "$$output"

ifeq ($(QHELP_OUT_DIR),)
# If not otherwise specified, compile qhelp to markdown in place
QHELP_OUT_DIR := ql/src
endif

qhelp-to-markdown:
scripts/qhelp-to-markdown.sh ql/src "$(QHELP_OUT_DIR)"

extractor:
export
where bazel
bazel version
pwd

gen:
export
declare -px
where bazel
bazel version
pwd

build/stats/src.stamp:
mkdir -p $(@D)/src
git clone 'https://github.com/golang/tools' $(@D)/src
git -C $(@D)/src checkout 9b52d559c609 -q
touch $@

ql/lib/go.dbscheme.stats: ql/lib/go.dbscheme build/stats/src.stamp extractor
rm -rf build/stats/database
codeql database create -l go -s build/stats/src -j4 --search-path . build/stats/database
codeql dataset measure -o $@ build/stats/database/db-go

test: all build/testdb/check-upgrade-path
# codeql test run -j0 ql/test --search-path .. --consistency-queries ql/test/consistency --compilation-cache=$(cache)
# use GOOS=linux because GOOS=darwin GOARCH=386 is no longer supported
# env GOOS=linux GOARCH=386 codeql$(EXE) test run -j0 ql/test/query-tests/Security/CWE-681 --search-path .. --consistency-queries ql/test/consistency --compilation-cache=$(cache)
cd extractor; bazel version; bazel test ...
bash extractor-smoke-test/test.sh || (echo "Extractor smoke test FAILED"; exit 1)

.PHONY: build/testdb/check-upgrade-path
build/testdb/check-upgrade-path : build/testdb/go.dbscheme ql/lib/go.dbscheme
codeql dataset upgrade build/testdb --search-path ql/lib
diff -q build/testdb/go.dbscheme ql/lib/go.dbscheme

.PHONY: build/testdb/go.dbscheme
build/testdb/go.dbscheme: ql/lib/upgrades/initial/go.dbscheme
rm -rf build/testdb
echo >build/empty.trap
codeql dataset import -S ql/lib/upgrades/initial/go.dbscheme build/testdb build/empty.trap

0 comments on commit 99547ee

Please sign in to comment.