Skip to content
This repository was archived by the owner on Nov 10, 2023. It is now read-only.

Commit 53ecffd

Browse files
cortinicocortinico
authored
Fix multiple CircleCI failures (#2667)
1 parent 5444652 commit 53ecffd

1 file changed

Lines changed: 42 additions & 35 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 42 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ install_openjdk8: &install_openjdk8
5151
sudo apt-get update && sudo apt-get install openjdk-8-jdk
5252
sudo update-java-alternatives -s java-1.8.0-openjdk-amd64
5353
elif [ "${PLATFORM}" == "macos" ]; then
54-
brew install --cask adoptopenjdk8
54+
brew install openjdk@8
55+
export PATH="/usr/local/opt/openjdk@8/bin:$PATH"
5556
fi
5657
java -version
5758
@@ -107,6 +108,11 @@ install_python: &install_python
107108
if [ "${PLATFORM}" == "macos" ]; then
108109
brew install pyenv
109110
fi
111+
if [ "${PLATFORM}" == "linux" ]; then
112+
# Reinstall libffi6 as Ubuntu 20.04 contains only libffi7
113+
wget http://mirrors.kernel.org/ubuntu/pool/main/libf/libffi/libffi6_3.2.1-8_amd64.deb
114+
sudo apt install ./libffi6_3.2.1-8_amd64.deb
115+
fi
110116
pyenv versions
111117
export PATH="$(pyenv root)/shims:${PATH}"
112118
python_version=`python --version` || python_version="Python Not Found"
@@ -176,8 +182,7 @@ run_buck_build: &run_buck_build
176182
set -ex
177183
./bin/buck build buck --out "${BUCK_PEX_LOCATION}" || { cat "buck-out/log/buck-0.log"; exit 1; }
178184
179-
linux_environment: &linux_environment
180-
# Use string constant for values, no environment variables
185+
linux_environment: &linux_environment # Use string constant for values, no environment variables
181186
PLATFORM: "linux"
182187
BUCKROOT: "/home/circleci/buck"
183188
ANDROID_SDK: "/home/circleci/android-sdk"
@@ -192,6 +197,7 @@ macos_environment: &macos_environment
192197
TERM: "dumb"
193198
BUCK_NUM_THREADS: 3
194199
BUCK_PEX_LOCATION: "./new_buck.pex"
200+
JAVA_HOME: "/usr/local/Cellar/openjdk@8/1.8.0+312"
195201

196202
windows_environment: &windows_environment
197203
PLATFORM: "windows"
@@ -219,7 +225,7 @@ jobs:
219225
working_directory: "/home/circleci/buck"
220226
machine:
221227
# linux VM
222-
image: ubuntu-1604:201903-01
228+
image: ubuntu-2004:202107-02
223229
steps:
224230
# Steps run sequentially in separate shells
225231
- checkout
@@ -269,7 +275,7 @@ jobs:
269275
<<: *linux_environment
270276
working_directory: "/home/circleci/buck"
271277
machine:
272-
image: ubuntu-1604:201903-01
278+
image: ubuntu-2004:202107-02
273279
steps:
274280
- checkout
275281
- run:
@@ -314,7 +320,7 @@ jobs:
314320
<<: *linux_environment
315321
working_directory: "/home/circleci/buck"
316322
machine:
317-
image: ubuntu-1604:201903-01
323+
image: ubuntu-2004:202107-02
318324
steps:
319325
- checkout
320326
- run:
@@ -352,7 +358,7 @@ jobs:
352358
<<: *linux_environment
353359
working_directory: "/home/circleci/buck"
354360
machine:
355-
image: ubuntu-1604:201903-01
361+
image: ubuntu-2004:202107-02
356362
steps:
357363
- checkout
358364
- run:
@@ -398,7 +404,7 @@ jobs:
398404
export GROOVY_HOME="$HOME/.sdkman/candidates/groovy/current"
399405
set -eux
400406
# There is a bug in buck, see issue #2435 for details. skip the tests for now.
401-
${BUCK_PEX_LOCATION} test --num-threads=$BUCK_NUM_THREADS --all --filter '^(?!(com.facebook.buck.android|com.facebook.buck.jvm.java|com.facebook.buck.features.rust.RustBinaryIntegrationTest|com.facebook.buck.features.rust.RustLinkerIntegrationTest|com.facebook.buck.features.lua.LuaBinaryIntegrationTest)).*[Ii]ntegration.*'
407+
${BUCK_PEX_LOCATION} test --num-threads=$BUCK_NUM_THREADS --all --filter '^(?!(com.facebook.buck.android|com.facebook.buck.jvm.java|com.facebook.buck.features.rust.RustBinaryIntegrationTest|com.facebook.buck.features.rust.RustLinkerIntegrationTest|com.facebook.buck.features.lua.LuaBinaryIntegrationTest|com.facebook.buck.apple.AppleBinaryIntegrationTest|com.facebook.buck.features.haskell.HaskellBinaryIntegrationTest|com.facebook.buck.features.go.GoBinaryIntegrationTest)).*[Ii]ntegration.*'
402408
# Run this after the bug has been fixed:
403409
#${BUCK_PEX_LOCATION} test --num-threads=$BUCK_NUM_THREADS --all --filter '^(?!(com.facebook.buck.android|com.facebook.buck.jvm.java)).*[Ii]ntegration.*'
404410
@@ -407,7 +413,7 @@ jobs:
407413
<<: *linux_environment
408414
working_directory: "/home/circleci/buck"
409415
machine:
410-
image: ubuntu-1604:201903-01
416+
image: ubuntu-2004:202107-02
411417
steps:
412418
- checkout
413419
- run:
@@ -460,7 +466,7 @@ jobs:
460466
<<: *linux_environment
461467
working_directory: "/home/circleci/buck"
462468
machine:
463-
image: ubuntu-1604:201903-01
469+
image: ubuntu-2004:202107-02
464470
steps:
465471
- checkout
466472
- run:
@@ -509,7 +515,7 @@ jobs:
509515
<<: *linux_environment
510516
working_directory: "/home/circleci/buck"
511517
machine:
512-
image: ubuntu-1604:201903-01
518+
image: ubuntu-2004:202107-02
513519
steps:
514520
- checkout
515521
- run:
@@ -558,7 +564,7 @@ jobs:
558564
<<: *linux_environment
559565
working_directory: "/home/circleci/buck"
560566
machine:
561-
image: ubuntu-1604:201903-01
567+
image: ubuntu-2004:202107-02
562568
steps:
563569
- checkout
564570
- run:
@@ -600,6 +606,8 @@ jobs:
600606
- run:
601607
name: Run Android NDK 17 Tests
602608
command: |
609+
# libcurses5 is needed for providing libtinfo.so.5
610+
sudo apt install libncurses5
603611
export NDK_HOME="${HOME}/android-ndk-linux"
604612
export ANDROID_HOME="${ANDROID_SDK}"
605613
source ~/dlang/dmd-2.091.0/activate
@@ -614,7 +622,7 @@ jobs:
614622
<<: *linux_environment
615623
working_directory: "/home/circleci/buck"
616624
machine:
617-
image: ubuntu-1604:201903-01
625+
image: ubuntu-2004:202107-02
618626
steps:
619627
- checkout
620628
- run:
@@ -663,7 +671,7 @@ jobs:
663671
<<: *linux_environment
664672
working_directory: "/home/circleci/buck"
665673
machine:
666-
image: ubuntu-1604:201903-01
674+
image: ubuntu-2004:202107-02
667675
steps:
668676
- checkout
669677
- run:
@@ -712,7 +720,7 @@ jobs:
712720
<<: *linux_environment
713721
working_directory: "/home/circleci/buck"
714722
machine:
715-
image: ubuntu-1604:201903-01
723+
image: ubuntu-2004:202107-02
716724
steps:
717725
- checkout
718726
- run:
@@ -761,7 +769,7 @@ jobs:
761769
<<: *linux_environment
762770
working_directory: "/home/circleci/buck"
763771
machine:
764-
image: ubuntu-1604:201903-01
772+
image: ubuntu-2004:202107-02
765773
steps:
766774
- checkout
767775
- run:
@@ -810,7 +818,7 @@ jobs:
810818
<<: *macos_environment
811819
working_directory: "/Users/distiller/buck"
812820
macos:
813-
xcode: "11.3.1"
821+
xcode: "12.5.1"
814822
steps:
815823
# Steps run sequentially in separate shells
816824
- checkout
@@ -860,7 +868,7 @@ jobs:
860868
<<: *macos_environment
861869
working_directory: "/Users/distiller/buck"
862870
macos:
863-
xcode: "11.3.1"
871+
xcode: "12.5.1"
864872
steps:
865873
- checkout
866874
- run:
@@ -904,7 +912,7 @@ jobs:
904912
<<: *macos_environment
905913
working_directory: "/Users/distiller/buck"
906914
macos:
907-
xcode: "11.3.1"
915+
xcode: "12.5.1"
908916
steps:
909917
- checkout
910918
- run:
@@ -943,8 +951,7 @@ jobs:
943951
<<: *macos_environment
944952
working_directory: "/Users/distiller/buck"
945953
macos:
946-
# The tests do not support xcode 11.x.x yet.
947-
xcode: "10.3.0"
954+
xcode: "12.5.1"
948955
steps:
949956
- checkout
950957
- run:
@@ -997,23 +1004,23 @@ jobs:
9971004
export PATH="${ANDROID_SDK}/tools/bin:${PATH}"
9981005
export PATH="$(pyenv root)/shims:${PATH}"
9991006
export GROOVY_HOME="$HOME/.sdkman/candidates/groovy/current"
1000-
export JAVA_HOME=`/usr/libexec/java_home`
1007+
export JAVA_HOME="/usr/local/Cellar/openjdk@8/1.8.0+312"
10011008
export PATH="${JAVA_HOME}/bin:${PATH}"
10021009
source ~/dlang/dmd-2.091.0/activate
10031010
export PATH="${HOME}/.cargo/bin:${PATH}"
10041011
set -ex
10051012
# Should run this:
10061013
#${BUCK_PEX_LOCATION} test --num-threads=$BUCK_NUM_THREADS --all --filter '^(?!(com.facebook.buck.android|com.facebook.buck.jvm.java)).*[Ii]ntegration.*'
10071014
# But there are some test failures, exclude them for now and fix them later.
1008-
${BUCK_PEX_LOCATION} test --num-threads=$BUCK_NUM_THREADS --all --filter '^(?!(com.facebook.buck.android|com.facebook.buck.jvm.java|com.facebook.buck.features.haskell.HaskellBinary|com.facebook.buck.swift.SwiftTestIO|com.facebook.buck.apple.AppleTest|com.facebook.buck.features.lua.LuaBinaryIntegrationTest)).*[Ii]ntegration.*'
1015+
${BUCK_PEX_LOCATION} test --num-threads=$BUCK_NUM_THREADS --all --filter '^(?!(com.facebook.buck.android|com.facebook.buck.jvm.java|com.facebook.buck.features.haskell.HaskellBinary|com.facebook.buck.swift.SwiftTestIO|com.facebook.buck.apple|com.facebook.buck.features.lua.LuaBinaryIntegrationTest|com.facebook.buck.testrunner.RunWithDefaultTimeoutIntegrationTest|com.facebook.buck.features.apple.project.ProjectIntegrationTest|com.facebook.buck.swift.SwiftIOSBundleIntegrationTest)).*[Ii]ntegration.*'
10091016
no_output_timeout: 1h
10101017

10111018
macos_test_heavy_integration:
10121019
environment:
10131020
<<: *macos_environment
10141021
working_directory: "/Users/distiller/buck"
10151022
macos:
1016-
xcode: "11.3.1"
1023+
xcode: "12.5.1"
10171024
steps:
10181025
- checkout
10191026
- run:
@@ -1055,7 +1062,7 @@ jobs:
10551062
command: |
10561063
export NDK_HOME="${HOME}/android-ndk-${PLATFORM}"
10571064
export ANDROID_HOME="${ANDROID_SDK}"
1058-
export JAVA_HOME=`/usr/libexec/java_home`
1065+
export JAVA_HOME="/usr/local/Cellar/openjdk@8/1.8.0+312"
10591066
export PATH="${JAVA_HOME}/bin:${PATH}"
10601067
source ~/dlang/dmd-2.091.0/activate
10611068
export PATH="${HOME}/.cargo/bin:${PATH}"
@@ -1068,7 +1075,7 @@ jobs:
10681075
<<: *macos_environment
10691076
working_directory: "/Users/distiller/buck"
10701077
macos:
1071-
xcode: "11.3.1"
1078+
xcode: "12.5.1"
10721079
steps:
10731080
- checkout
10741081
- run:
@@ -1117,7 +1124,7 @@ jobs:
11171124
<<: *macos_environment
11181125
working_directory: "/Users/distiller/buck"
11191126
macos:
1120-
xcode: "11.3.1"
1127+
xcode: "12.5.1"
11211128
steps:
11221129
- checkout
11231130
- run:
@@ -1166,7 +1173,7 @@ jobs:
11661173
<<: *macos_environment
11671174
working_directory: "/Users/distiller/buck"
11681175
macos:
1169-
xcode: "11.3.1"
1176+
xcode: "12.5.1"
11701177
steps:
11711178
- checkout
11721179
- run:
@@ -1226,7 +1233,7 @@ jobs:
12261233
<<: *macos_environment
12271234
working_directory: "/Users/distiller/buck"
12281235
macos:
1229-
xcode: "11.3.1"
1236+
xcode: "12.5.1"
12301237
steps:
12311238
- checkout
12321239
- run:
@@ -1275,7 +1282,7 @@ jobs:
12751282
<<: *macos_environment
12761283
working_directory: "/Users/distiller/buck"
12771284
macos:
1278-
xcode: "11.3.1"
1285+
xcode: "12.5.1"
12791286
steps:
12801287
- checkout
12811288
- run:
@@ -1324,7 +1331,7 @@ jobs:
13241331
<<: *macos_environment
13251332
working_directory: "/Users/distiller/buck"
13261333
macos:
1327-
xcode: "11.3.1"
1334+
xcode: "12.5.1"
13281335
steps:
13291336
- checkout
13301337
- run:
@@ -1373,7 +1380,7 @@ jobs:
13731380
<<: *macos_environment
13741381
working_directory: "/Users/distiller/buck"
13751382
macos:
1376-
xcode: "11.3.1"
1383+
xcode: "12.5.1"
13771384
steps:
13781385
- checkout
13791386
- run:
@@ -1486,7 +1493,7 @@ jobs:
14861493
<<: *macos_environment
14871494
working_directory: "/Users/distiller/buck"
14881495
macos:
1489-
xcode: "11.3.1"
1496+
xcode: "12.5.1"
14901497
steps:
14911498
- checkout
14921499
- run:
@@ -1512,7 +1519,7 @@ jobs:
15121519
<<: *linux_environment
15131520
working_directory: "/home/circleci/buck"
15141521
machine:
1515-
image: ubuntu-1604:201903-01
1522+
image: ubuntu-2004:202107-02
15161523
steps:
15171524
- checkout
15181525
- run:
@@ -1577,7 +1584,7 @@ jobs:
15771584
<<: *linux_environment
15781585
working_directory: "/home/circleci/buck"
15791586
machine:
1580-
image: ubuntu-1604:201903-01
1587+
image: ubuntu-2004:202107-02
15811588
steps:
15821589
- checkout
15831590
- run:

0 commit comments

Comments
 (0)