From b1d56e6e2ddfde9c06a8cccc55225518331e320e Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sat, 14 Sep 2024 08:00:26 -0500 Subject: [PATCH] cleanup --- .evergreen/config.yml | 2 +- .github/workflows/codeql.yml | 6 ++++-- Taskfile.yml | 28 ++++++++++++++-------------- etc/prep-perf.sh | 0 4 files changed, 19 insertions(+), 17 deletions(-) mode change 100644 => 100755 etc/prep-perf.sh diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 05cff358d7..9d3c5c19ad 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -394,7 +394,7 @@ functions: include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"] script: | ${PREPARE_SHELL} - task run-atlas + task test-atlas run-ocsp-test: - command: shell.exec diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index dd93c729a5..23fa9c87d2 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -33,9 +33,11 @@ jobs: languages: go build-mode: manual + - name: Install Taskfile support + uses: arduino/setup-task@v2 + - shell: bash - run: | - make build + run: task build - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3 diff --git a/Taskfile.yml b/Taskfile.yml index 35062e9ee1..7f955eb6ec 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -11,9 +11,9 @@ tasks: default: deps: [build, check-license, check-fmt, check-modules, lint, test-short] - add-license: etc/check_license.sh -a + add-license: bash etc/check_license.sh -a - check-license: etc/check_license.sh + check-license: bash etc/check_license.sh build: deps: [cross-compile, build-tests, build-compile-check] @@ -23,7 +23,7 @@ tasks: build-tests: go test -short ${BUILD_TAGS} -run ^$$ ./... - build-compile-check: etc/compile_check.sh + build-compile-check: bash etc/compile_check.sh cross-compile: - GOOS=linux GOARCH=386 go build ./... @@ -36,21 +36,21 @@ tasks: check-fmt: deps: [install-lll] cmds: - - etc/check_fmt.sh + - bash etc/check_fmt.sh - check-modules: etc/check_modules.sh + check-modules: bash etc/check_modules.sh doc: godoc -http=:6060 -index fmt: go fmt ./... - api-report: etc/api_report.sh + api-report: bash etc/api_report.sh - install-libmongocrypt: etc/install-libmongocrypt.sh + install-libmongocrypt: bash etc/install-libmongocrypt.sh - run-docker: etc/run_docker.sh + run-docker: bash etc/run_docker.sh - cherry-picker: etc/cherry-picker.sh + cherry-picker: bash etc/cherry-picker.sh # Lint with various GOOS and GOARCH tasks to catch static analysis failures that may only affect # specific operating systems or architectures. For example, staticcheck will only check for 64-bit @@ -66,7 +66,7 @@ tasks: - GOOS=linux GOARCH=ppc64le golangci-lint run --config .golangci.yml ./... - GOOS=linux GOARCH=s390x golangci-lint run --config .golangci.yml ./... - update-notices: etc/generate_notices.pl > THIRD-PARTY-NOTICES + update-notices: bash etc/generate_notices.pl > THIRD-PARTY-NOTICES ### Local testing tasks. ### test: go test ${BUILD_TAGS} -timeout {{.TEST_TIMEOUT}}s -p 1 ./... @@ -79,11 +79,11 @@ tasks: test-short: go test ${BUILD_TAGS} -timeout 60s -short ./... - test-oidc: etc/run-oidc-test.sh 'task --silent evg-test-oidc-auth' + test-oidc: bash etc/run-oidc-test.sh 'task --silent evg-test-oidc-auth' - test-atlas: etc/run-atlas-test.sh + test-atlas: bash etc/run-atlas-test.sh - test-awskms: etc/run-awskms-test.sh + test-awskms: bash etc/run-awskms-test.sh ### Local FaaS tasks. ### build-faas-awslambda: @@ -182,7 +182,7 @@ tasks: perf-files: internal: true cmds: - - etc/prep-perf.sh + - bash etc/prep-perf.sh install-lll: internal: true diff --git a/etc/prep-perf.sh b/etc/prep-perf.sh old mode 100644 new mode 100755