Skip to content

Commit ad71520

Browse files
committed
New try
1 parent 83fcb57 commit ad71520

1 file changed

Lines changed: 16 additions & 10 deletions

File tree

.github/workflows/ci.yml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717
env:
1818
LLVM_VER: 17
1919
PYTHON_VER: 3.11
20-
VCPKG_REGISTRY_VERSION: v1.0.0
20+
VCPKG_REGISTRY_VERSION: v1.1.0
2121

2222
jobs:
2323
build:
@@ -31,15 +31,8 @@ jobs:
3131
packages: write
3232

3333
steps:
34-
- name: Setup deploy keys
35-
run: printf "%s" "$MX_REGISTRY_KEY" | ssh-add -
36-
env:
37-
MX_REGISTRY_KEY: ${{ secrets.MX_REGISTRY_KEY }}
38-
3934
- name: Checkout repository
4035
uses: actions/checkout@v4
41-
with:
42-
submodules: "recursive"
4336
- run: git config --global --add safe.directory '*'
4437

4538
- name: Install prereqs
@@ -50,7 +43,18 @@ jobs:
5043
curl -sSL https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
5144
echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${LLVM_VER} main" | tee -a /etc/apt/sources.list > /dev/null
5245
echo "deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${LLVM_VER} main" | tee -a /etc/apt/sources.list > /dev/null
53-
apt-get update; apt-get install gh clang-${LLVM_VER} lld-${LLVM_VER} python${PYTHON_VER} python${PYTHON_VER}-dev -y
46+
apt-get update; apt-get install gh clang-${LLVM_VER} lld-${LLVM_VER} python${PYTHON_VER} python${PYTHON_VER}-dev openssh-client -y
47+
48+
- name: Fetch submodules
49+
run: |
50+
mkdir -p ~/.ssh
51+
eval $(ssh-agent -s)
52+
ssh-keyscan github.com >> ~/.ssh/known_hosts
53+
chmod 600 ~/.ssh/known_hosts
54+
echo "$MX_REGISTRY_KEY" | ssh-add -
55+
git submodule update --init --recursive -- vcpkg-registry
56+
env:
57+
MX_REGISTRY_KEY: ${{ secrets.MX_REGISTRY_KEY }}
5458

5559
- name: Setup cmake
5660
uses: trail-of-forks/actions-setup-cmake@master
@@ -79,7 +83,9 @@ jobs:
7983
8084
- name: Preseed vcpkg cache
8185
run: |
82-
gh release download $VCPKG_REGISTRY_VERSION vcpkg-binary-cache.tar.bz2 --repo trailofbits/multiplier-vcpkg-registry
86+
gh release download $VCPKG_REGISTRY_VERSION \
87+
--pattern vcpkg-binary-cache.tar.bz2 \
88+
--repo trailofbits/multiplier-vcpkg-registry
8389
tar xjf vcpkg-binary-cache.tar.bz2
8490
rm vcpkg-binary-cache.tar.bz2
8591
env:

0 commit comments

Comments
 (0)