Skip to content

Commit fe39e36

Browse files
author
Ali
committed
Potentially fix github actions build (if this doesn't work, we'll fix it later after the release) [skip ci]
1 parent 096a95c commit fe39e36

1 file changed

Lines changed: 4 additions & 13 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ jobs:
1717
fetch-depth: '0'
1818

1919
- name: Set active Xcode path
20-
run: sudo xcode-select -s /Applications/Xcode_13.2.1.app/Contents/Developer
20+
run: |
21+
XCODE_VERSION=$(cat versions.json | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["xcode"]);')
22+
sudo xcode-select -s /Applications/Xcode_$XCODE_VERSION.app/Contents/Developer
2123
2224
- name: Create canonical source directory
2325
run: |
@@ -37,15 +39,6 @@ jobs:
3739
# use canonical bazel root
3840
BAZEL_USER_ROOT="/private/var/tmp/_bazel_telegram"
3941
40-
# download bazel
41-
mkdir -p $HOME/bazel-dist
42-
pushd $HOME/bazel-dist
43-
curl -O -L https://github.com/bazelbuild/bazel/releases/download/4.0.0/bazel-4.0.0-darwin-x86_64
44-
mv bazel-4.0.0* bazel
45-
chmod +x bazel
46-
./bazel --version
47-
popd
48-
4942
cd $SOURCE_DIR
5043
5144
BUILD_NUMBER_OFFSET="$(cat build_number_offset)"
@@ -70,9 +63,8 @@ jobs:
7063
for f in "$CERTS_PATH"/*.p12; do
7164
security import "$f" -k "$MY_KEYCHAIN" -P "" -T /usr/bin/codesign -T /usr/bin/security
7265
done
73-
# fake certificates are self-signed, so we need to manually mark them as trusted (otherwise bazel will not pick them up)
7466
for f in "$CERTS_PATH"/*.cer; do
75-
sudo security add-trusted-cert -d -r trustRoot -p codeSign -k "$MY_KEYCHAIN" "$f"
67+
security import "$f" -k "$MY_KEYCHAIN" -P "" -T /usr/bin/codesign -T /usr/bin/security
7668
done
7769
security set-key-partition-list -S apple-tool:,apple: -k "$MY_KEYCHAIN_PASSWORD" "$MY_KEYCHAIN"
7870
@@ -83,7 +75,6 @@ jobs:
8375
8476
# build the app
8577
python3 build-system/Make/Make.py \
86-
--bazel="$HOME/bazel-dist/bazel" \
8778
--bazelUserRoot="$BAZEL_USER_ROOT" \
8879
build \
8980
--disableParallelSwiftmoduleGeneration \

0 commit comments

Comments
 (0)