Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/dependencies-0b07636886
Browse files Browse the repository at this point in the history
  • Loading branch information
TylerJang27 authored Aug 30, 2024
2 parents 43289e8 + 160ec2d commit 040680c
Show file tree
Hide file tree
Showing 10 changed files with 997 additions and 437 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
uses: github/codeql-action/init@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
# Override language selection by uncommenting this and choosing your languages
with:
languages: javascript

# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
# If this step fails, then you should remove it and run the build manually (see below).
- name: Autobuild
uses: github/codeql-action/autobuild@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
uses: github/codeql-action/autobuild@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -56,4 +56,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
uses: github/codeql-action/analyze@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: Upload to code-scanning
uses: github/codeql-action/upload-sarif@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
uses: github/codeql-action/upload-sarif@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
with:
sarif_file: results.sarif
3 changes: 1 addition & 2 deletions .trunk/trunk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ plugins:

- id: configs
uri: https://github.com/trunk-io/configs
ref: v1.0.7
ref: v1.0.8

lint:
files:
Expand Down Expand Up @@ -46,7 +46,6 @@ lint:
disabled:
- pylint # pylint diagnostics are too strict
- semgrep
- trivy # investigating issues with shared cachedir

ignore:
- linters: [ALL]
Expand Down
10 changes: 10 additions & 0 deletions actions/submodules/plugin.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 0.1
actions:
definitions:
- id: submodule-init-update
display_name: Submodule Init Update
description: Git hook for updating submodules
run: git submodule update --init --recursive
triggers:
- git_hooks: [post-checkout, post-merge, pre-rebase]
notify_on_error: false
135 changes: 135 additions & 0 deletions linters/buildifier/test_data/buildifier_v7.3.1_basic_check.check.shot
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
// trunk-upgrade-validation:RELEASE

exports[`Testing linter buildifier test basic_check 1`] = `
{
"issues": [
{
"code": "module-docstring",
"column": "1",
"file": "test_data/basic.bzl",
"issueClass": "ISSUE_CLASS_EXISTING",
"issueUrl": "https://github.com/bazelbuild/buildtools/blob/main/WARNINGS.md#module-docstring",
"level": "LEVEL_HIGH",
"line": "1",
"linter": "buildifier",
"message": "The file has no module docstring.
A module docstring is a string literal (not a comment) which should be the first statement of a file (it may follow comment lines).",
"targetType": "starlark",
},
{
"code": "load",
"column": "26",
"file": "test_data/basic.bzl",
"issueClass": "ISSUE_CLASS_EXISTING",
"issueUrl": "https://github.com/bazelbuild/buildtools/blob/main/WARNINGS.md#load",
"level": "LEVEL_HIGH",
"line": "1",
"linter": "buildifier",
"message": "Loaded symbol "a" is unused. Please remove it.
To disable the warning, add '@unused' in a comment.
If you want to re-export a symbol, use the following pattern:

load(..., _a = "a", ...)
a = _a",
"targetType": "starlark",
},
{
"code": "load",
"column": "26",
"file": "test_data/basic.bzl",
"issueClass": "ISSUE_CLASS_EXISTING",
"issueUrl": "https://github.com/bazelbuild/buildtools/blob/main/WARNINGS.md#load",
"level": "LEVEL_HIGH",
"line": "2",
"linter": "buildifier",
"message": "Loaded symbol "b" is unused. Please remove it.
To disable the warning, add '@unused' in a comment.
If you want to re-export a symbol, use the following pattern:

load(..., _b = "b", ...)
b = _b",
"targetType": "starlark",
},
],
"lintActions": [
{
"command": "fix",
"fileGroupName": "bazel-build",
"linter": "buildifier",
"paths": [
"test_data/add_tables.BUILD",
],
"verb": "TRUNK_VERB_FMT",
},
{
"command": "fix",
"fileGroupName": "starlark",
"linter": "buildifier",
"paths": [
"test_data/basic.bzl",
],
"verb": "TRUNK_VERB_FMT",
},
{
"command": "warn",
"fileGroupName": "bazel-build",
"linter": "buildifier",
"paths": [
"test_data/add_tables.BUILD",
],
"verb": "TRUNK_VERB_CHECK",
},
{
"command": "warn",
"fileGroupName": "starlark",
"linter": "buildifier",
"paths": [
"test_data/basic.bzl",
],
"verb": "TRUNK_VERB_CHECK",
},
{
"command": "warn",
"fileGroupName": "bazel-build",
"linter": "buildifier",
"paths": [
"test_data/add_tables.BUILD",
],
"upstream": true,
"verb": "TRUNK_VERB_CHECK",
},
{
"command": "warn",
"fileGroupName": "starlark",
"linter": "buildifier",
"paths": [
"test_data/basic.bzl",
],
"upstream": true,
"verb": "TRUNK_VERB_CHECK",
},
],
"taskFailures": [],
"unformattedFiles": [
{
"column": "1",
"file": "test_data/add_tables.BUILD",
"issueClass": "ISSUE_CLASS_UNFORMATTED",
"level": "LEVEL_HIGH",
"line": "1",
"linter": "buildifier",
"message": "Incorrect formatting, autoformat by running 'trunk fmt'",
},
{
"column": "1",
"file": "test_data/basic.bzl",
"issueClass": "ISSUE_CLASS_UNFORMATTED",
"level": "LEVEL_HIGH",
"line": "1",
"linter": "buildifier",
"message": "Incorrect formatting, autoformat by running 'trunk fmt'",
},
],
}
`;
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
// trunk-upgrade-validation:RELEASE

exports[`Testing formatter buildifier test no_config 1`] = `
"foo_macro(
fizz = [
":lib2",
":lib1",
],
)

filegroup(
name = "files",
srcs = glob(["**"]),
)

sh_library(
name = "lib1",
srcs = ["src1.sh"],
)

sh_library(
name = "lib2",
srcs = ["src1.sh"],
)

sh_binary(
name = "foo",
srcs = ["foo.sh"],
deps = [
":lib1",
":lib2",
],
)
"
`;
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
// trunk-upgrade-validation:RELEASE

exports[`Testing formatter buildifier test no_config 1`] = `
"# Misformatted file
def eponymous_name():
name = native.package_name()

return name[name.rfind("/") + 1:]
"
`;
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
// trunk-upgrade-validation:RELEASE

exports[`Testing formatter buildifier test with_config 1`] = `
"foo_macro(
fizz = [
":lib1",
":lib2",
],
)

filegroup(
name = "files",
srcs = glob(["**"]),
)

sh_library(
name = "lib1",
srcs = ["src1.sh"],
)

sh_library(
name = "lib2",
srcs = ["src1.sh"],
)

sh_binary(
name = "foo",
srcs = ["foo.sh"],
deps = [
":lib1",
":lib2",
],
)
"
`;
Loading

0 comments on commit 040680c

Please sign in to comment.