@@ -39,8 +39,8 @@ commands:
3939      - run :
4040          name : Turn on RUST_BACKTRACE and RUST_LOG for any job that installs rustc 
4141          command : | 
42-                echo "export RUST_BACKTRACE=1" >> $BASH_ENV 
43-                echo "export RUST_LOG=glean_core=debug" >> $BASH_ENV 
42+             echo "export RUST_BACKTRACE=1" >> $BASH_ENV 
43+             echo "export RUST_LOG=glean_core=debug" >> $BASH_ENV 
4444run :
4545          name : Setup Rust toolchain 
4646          command : | 
@@ -91,16 +91,16 @@ commands:
9191      - run :
9292          name : Setup custom environment variables 
9393          command : | 
94-                echo 'export PATH=$HOME/.cargo/bin:$PATH' >> $BASH_ENV 
94+             echo 'export PATH=$HOME/.cargo/bin:$PATH' >> $BASH_ENV 
9595
9696install-android-ndk :
9797    steps :
9898      - run :
9999          name : Install missing Android SDK & NDK 
100100          command : | 
101-                sdkmanager \ 
102-                  "build-tools;33.0.0" \ 
103-                  "ndk;25.1.8937393" 
101+             sdkmanager \ 
102+               "build-tools;33.0.0" \ 
103+               "ndk;25.1.8937393" 
104104
105105android-setup :
106106    steps :
@@ -111,7 +111,7 @@ commands:
111111      - run :
112112          name : Restrict to Linux builds only 
113113          command : | 
114-                echo "rust.targets=linux-x86-64" > local.properties 
114+             echo "rust.targets=linux-x86-64" > local.properties 
115115
116116test-python :
117117    steps :
@@ -120,8 +120,8 @@ commands:
120120      - run :
121121          name : Remove coredump file restriction 
122122          command : | 
123-                # tell the operating system to remove the file size limit on core dump files 
124-                ulimit -c unlimited 
123+             # tell the operating system to remove the file size limit on core dump files 
124+             ulimit -c unlimited 
125125run :
126126          name : Python tests 
127127          command : | 
@@ -131,9 +131,9 @@ commands:
131131          name : Detect and gather coredump files 
132132          when : always 
133133          command : | 
134-                mkdir -p ~/coredumps 
135-                # Try to copy the core file(s). Don't fail if they don't exist. 
136-                cp core.* ~/coredumps || true  
134+             mkdir -p ~/coredumps 
135+             # Try to copy the core file(s). Don't fail if they don't exist. 
136+             cp core.* ~/coredumps || true  
137137store_artifacts :
138138          path : ~/coredumps 
139139          destination : coredumps 
@@ -417,8 +417,8 @@ jobs:
417417      - run :
418418          name : Remove coredump file restriction 
419419          command : | 
420-                # tell the operating system to remove the file size limit on core dump files 
421-                ulimit -c unlimited 
420+             # tell the operating system to remove the file size limit on core dump files 
421+             ulimit -c unlimited 
422422run :
423423          name : Android tests 
424424          command : ./gradlew --no-daemon :glean:testDebugUnitTest 
@@ -428,22 +428,22 @@ jobs:
428428      - run :
429429          name : Save test results 
430430          command : | 
431-                mkdir -p ~/test-results/junit/ 
432-                mkdir -p ~/test-results/tests/ 
433-                cp -a glean-core/android/build/reports/tests ~/test-results/ 
434-                find glean-core/android/build -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/test-results/junit/ \; 
431+             mkdir -p ~/test-results/junit/ 
432+             mkdir -p ~/test-results/tests/ 
433+             cp -a glean-core/android/build/reports/tests ~/test-results/ 
434+             find glean-core/android/build -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/test-results/junit/ \; 
435435when : always 
436436      - store_artifacts :
437437          path : ~/test-results/tests 
438438          destination : test-results 
439439      - run :
440440          name : Detect and gather coredump files 
441441          command : | 
442-                mkdir -p ~/coredumps 
443-                # Try to copy the core file from a default location. Don't fail if it doesn't exist. 
444-                cp -a glean-core/android/core ~/coredumps || true  
445-                # The JVM/Gradle might also produce a log file named like "hs_err_pid3247.log", let's copy that as well 
446-                find . -type f -name "hs_*.log" | xargs -I% cp -a % ~/coredumps/% 
442+             mkdir -p ~/coredumps 
443+             # Try to copy the core file from a default location. Don't fail if it doesn't exist. 
444+             cp -a glean-core/android/core ~/coredumps || true  
445+             # The JVM/Gradle might also produce a log file named like "hs_err_pid3247.log", let's copy that as well 
446+             find . -type f -name "hs_*.log" | xargs -I% cp -a % ~/coredumps/% 
447447store_artifacts :
448448          path : ~/coredumps 
449449          destination : coredumps 
@@ -452,7 +452,7 @@ jobs:
452452      - run :
453453          name : Build Android Sample App 
454454          command : | 
455-                ./gradlew :glean-sample-app:assembleAndroidTest 
455+             ./gradlew :glean-sample-app:assembleAndroidTest 
456456environment :
457457            GRADLE_OPTS : -Xmx2048m 
458458            TARGET_CFLAGS : -DNDEBUG 
@@ -612,7 +612,7 @@ jobs:
612612run :
613613          name : Build XCFramework archive 
614614          command : | 
615-                bash bin/build-xcframework.sh 
615+             bash bin/build-xcframework.sh 
616616run :
617617          name : Build sample app 
618618          command : | 
@@ -664,9 +664,9 @@ jobs:
664664      - run :
665665          name : Release glean-swift 
666666          command : | 
667-                git config --global user.email "[email protected] " 668-                git config --global user.name "Glean automated release" 
669-                ./bin/publish-glean-swift.sh "${CIRCLE_TAG}" 
667+             git config --global user.email "[email protected] " 668+             git config --global user.name "Glean automated release" 
669+             ./bin/publish-glean-swift.sh "${CIRCLE_TAG}" 
670670
671671# ##########################################################################
672672  #  Python
@@ -700,7 +700,7 @@ jobs:
700700      - skip-if-doc-only 
701701      - run :
702702          command : | 
703-                echo "export GLEAN_PYDEPS=min" >> $BASH_ENV 
703+             echo "export GLEAN_PYDEPS=min" >> $BASH_ENV 
704704test-python 
705705
706706  Python 3_7 tests :
@@ -736,7 +736,7 @@ jobs:
736736      - skip-if-doc-only 
737737      - run :
738738          command : | 
739-                echo "export GLEAN_PYDEPS=min" >> $BASH_ENV 
739+             echo "export GLEAN_PYDEPS=min" >> $BASH_ENV 
740740test-python 
741741
742742  Python 3_9 on Alpine tests :
@@ -921,10 +921,11 @@ jobs:
921921            GLEAN_BUILD_VARIANT : release 
922922      - run :
923923          name : Upload wheels to PyPI 
924-           command :
924+           command : | 
925+             cd glean-core/python 
925926            # Requires that the TWINE_USERNAME and TWINE_PASSWORD environment 
926927            # variables are configured in CircleCI's environment variables. 
927-             .venv3.9/bin/python3 -m twine upload glean-core/python/ dist/* 
928+             .venv3.9/bin/python3 -m twine upload dist/* 
928929install-ghr-darwin 
929930      - run :
930931          name : Publish to Github 
0 commit comments