Skip to content

Commit 5ae97e6

Browse files
committed
Foo
1 parent f6b95ac commit 5ae97e6

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

.github/actions/setup-env/action.yml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,13 @@ runs:
2929
uses: actions/cache@v4
3030
id: toolchain
3131
with:
32-
path: /opt/mongodbtoolchain/v4
32+
path: /opt/mongodbtoolchain
3333
key: toolchain-${{ env.OS_CODE_NAME }}-${{ env.ARCH }}
3434

3535
- name: Install toolchain
3636
shell: bash
37-
if: steps.toolchain.outputs.cache-hit != 'true'
37+
# if: steps.toolchain.outputs.cache-hit != 'true'
3838
run: |
3939
curl -O https://downloads.percona.com/downloads/packaging/toolchain_installer.tar.gz
4040
tar -zxvf toolchain_installer.tar.gz
4141
bash -x ./installer.sh -k --download-url https://downloads.percona.com/downloads/packaging/${OS_CODE_NAME}_mongodbtoolchain_${ARCH}.tar.gz
42-
43-
- name: Export toolchain path
44-
shell: bash
45-
run: |
46-
find /opt/mongodbtoolchain/v4/bin
47-
echo "/opt/mongodbtoolchain/v4/bin" >> $GITHUB_PATH
48-
49-
- name: Debug path
50-
shell: bash
51-
run: |
52-
echo "PATH: $PATH"

buildscripts/clang_format.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,15 @@ def __init__(self, path, cache_dir):
103103
self.path = None
104104

105105
# Check for the binary in the expected toolchain directory on non-windows systems
106+
print("Checking for clang-format in toolchain path: %s" % CLANG_FORMAT_TOOLCHAIN_PATH)
106107
if self.path is None:
108+
print("sys.platform: %s" % sys.platform)
107109
if sys.platform != "win32":
110+
print("Path exists: %s" % os.path.exists(CLANG_FORMAT_TOOLCHAIN_PATH))
108111
if os.path.exists(CLANG_FORMAT_TOOLCHAIN_PATH):
109112
self.path = CLANG_FORMAT_TOOLCHAIN_PATH
110113
if not self._validate_version():
114+
print("Version problem with toolchain clang-format")
111115
self.path = None
112116

113117
# Check the users' PATH environment variable now

0 commit comments

Comments
 (0)