Skip to content

Commit e2bf9e4

Browse files
committed
Update installation commands based on doc
1 parent c5f1311 commit e2bf9e4

2 files changed

Lines changed: 16 additions & 4 deletions

File tree

.github/actions/install-linux-sgx/action.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,23 @@ runs:
2121
echo "::error title=⛔ error hint::Only support ubuntu-22.04 for now"
2222
exit 1
2323
24+
- name: prerequisites
25+
shell: bash
26+
run: |
27+
sudo apt update
28+
sudo apt upgrade -y
29+
sudo apt install -y build-essential ocaml automake autoconf libtool wget python3 libssl-dev dkms
30+
sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 1
31+
2432
- name: Create installation directory
2533
shell: bash
2634
run: sudo mkdir -p /opt/intel
2735

28-
- name: Download and install SGX SDK on ubuntu-22.04
36+
- name: Download and install SGX SDK on ubuntu-22.04(w/ in-kernel driver)
2937
if: ${{ inputs.os == 'ubuntu-22.04' }}
3038
shell: bash
3139
run: |
32-
sudo wget -O sgx_linux_x64_sdk.bin https://download.01.org/intel-sgx/sgx-linux/2.21/distro/ubuntu22.04-server/sgx_linux_x64_sdk_2.21.100.1.bin
40+
sudo wget -O sgx_linux_x64_sdk.bin https://download.01.org/intel-sgx/latest/linux-latest/distro/ubuntu22.04-server/sgx_linux_x64_sdk_2.25.100.3.bin
3341
sudo chmod +x sgx_linux_x64_sdk.bin
3442
echo 'yes' | sudo ./sgx_linux_x64_sdk.bin
3543
working-directory: /opt/intel
@@ -40,7 +48,7 @@ runs:
4048
echo "deb [arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/intel-sgx.list
4149
wget -qO - https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | sudo apt-key add -
4250
sudo apt update
43-
sudo apt install -y libsgx-launch libsgx-urts
51+
sudo apt install -y libsgx-epid libsgx-quote-ex libsgx-dcap-ql libsgx-enclave-common-dev libsgx-dcap-ql-dev
4452
4553
- name: Source SGX SDK environment
4654
shell: bash

.github/workflows/compilation_on_sgx.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,11 @@ jobs:
224224
needs: [build_iwasm, build_llvm_libraries]
225225
runs-on: ${{ matrix.os }}
226226
strategy:
227+
fail-fast: true
227228
matrix:
228229
#"fast-interp" because of SIMDE
229-
running_mode: ["classic-interp", "aot", "fast-jit"]
230+
#"fast-jit" (workaround)
231+
running_mode: ["classic-interp", "aot"]
230232
test_option:
231233
[$DEFAULT_TEST_OPTIONS, $SIMD_TEST_OPTIONS, $XIP_TEST_OPTIONS]
232234
os: [ubuntu-22.04]
@@ -267,6 +269,7 @@ jobs:
267269
if: matrix.running_mode == 'aot' && steps.retrieve_llvm_libs.outputs.cache-hit != 'true'
268270
run: echo "::error::can not get prebuilt llvm libraries" && exit 1
269271

272+
#https://download.01.org/intel-sgx/sgx-linux/2.21/distro/ubuntu22.04-server/sgx_linux_x64_sdk_2.21.100.1.bin
270273
- name: install SGX SDK and necessary libraries
271274
uses: ./.github/actions/install-linux-sgx
272275
with:
@@ -276,6 +279,7 @@ jobs:
276279
run: sudo apt update && sudo apt install -y ninja-build
277280

278281
- name: run spec tests
282+
shell: bash
279283
run: |
280284
source /opt/intel/sgxsdk/environment
281285
./test_wamr.sh ${{ matrix.test_option }} -t ${{ matrix.running_mode }}

0 commit comments

Comments
 (0)