Skip to content

Commit fa5a841

Browse files
committed
Revert "add code violations and test container"
This reverts commit c8f08a1.
1 parent 6787f72 commit fa5a841

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

.github/workflows/pr-code-format.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
code_formatter:
1414
runs-on: ubuntu-24.04
1515
container:
16-
image: 'ghcr.io/llvm/ci-ubuntu-24.04-format-fix-gha'
16+
image: 'ghcr.io/llvm/ci-ubuntu-24.04-format'
1717
timeout-minutes: 30
1818
concurrency:
1919
group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
@@ -25,6 +25,14 @@ jobs:
2525
with:
2626
fetch-depth: 2
2727

28+
# We need to set the repo checkout as safe, otherwise tj-actions/changed-files
29+
# will fail due to the changed ownership inside the container.
30+
# TODO(boomanaiden154): We should probably fix this by having the default user
31+
# in the container have the same ID as the GHA user on the host.
32+
- name: Set Safe Directory
33+
run: |
34+
chown -R root $(pwd)
35+
2836
- name: Get changed files
2937
id: changed-files
3038
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5

clang-tools-extra/clang-tidy/ClangTidy.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class AnalyzerDiagnosticConsumer : public ento::PathDiagnosticConsumer {
7070
public:
7171
AnalyzerDiagnosticConsumer(ClangTidyContext &Context) : Context(Context) {}
7272

73-
void FlushDiagnosticsImpl( std::vector<const ento::PathDiagnostic *> &Diags,
73+
void FlushDiagnosticsImpl(std::vector<const ento::PathDiagnostic *> &Diags,
7474
FilesMade *FilesMade) override {
7575
for (const ento::PathDiagnostic *PD : Diags) {
7676
SmallString<64> CheckName(AnalyzerCheckNamePrefix);

llvm/utils/git/code-format-helper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ def format_run(self, changed_files: List[str], args: FormatArgs) -> Optional[str
265265
proc = subprocess.run(cf_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
266266
sys.stdout.write(proc.stderr.decode("utf-8"))
267267

268-
if proc.returncode != 0:
268+
if proc.returncode != 0:
269269
# formatting needed, or the command otherwise failed
270270
if args.verbose:
271271
print(f"error: {self.name} exited with code {proc.returncode}")

0 commit comments

Comments
 (0)