Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove SGX target from release job(s) #6492

Merged
merged 1 commit into from
Sep 20, 2024
+8 −20
Merged

Remove SGX target from release job(s) #6492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions .github/workflows/containers-ghcr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
platform: [sgx, virtual, snp]
platform: [virtual, snp]
type: [dev, run]
run_js: [true, ""]
clang_version: ["11", "15"]
exclude:
- type: dev
run_js: true
- platform: sgx
clang_version: "15"
- platform: virtual
clang_version: "11"
- platform: snp
clang_version: "11"

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -66,7 +59,7 @@ jobs:
context: .
file: ./docker/app_${{ matrix.type }}
build-args: |
clang_version=${{ matrix.clang_version }}
clang_version=15
platform=${{ matrix.platform }}
"ansible_vars=ccf_ver=${{ steps.tref.outputs.tag }} ${{ matrix.run_js && 'run_js=true' || '' }}"
push: true
Expand Down
17 changes: 6 additions & 11 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,6 @@ jobs:
- name: snp
image: default
nodes: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
- name: sgx
image: sgx
nodes: [self-hosted, 1ES.Pool=gha-sgx-ccf-sub]
container_options: --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx
cmake_options: -DLVI_MITIGATIONS=ON
runs-on: ${{ matrix.platform.nodes }}
container:
image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-25-07-2024
Expand Down Expand Up @@ -185,14 +180,14 @@ jobs:
with:
name: compatibility
path: build/compatibility_report.json
if: "${{ matrix.platform.name == 'sgx' }}"
if: "${{ matrix.platform.name == 'virtual' }}"

- name: "Upload TLS Report"
uses: actions/upload-artifact@v4
with:
name: tls
path: build/tls_report.html
if: "${{ matrix.platform.name == 'sgx' }}"
if: "${{ matrix.platform.name == 'virtual' }}"

- name: "Build Python Wheel"
id: build_wheel
Expand All @@ -206,14 +201,14 @@ jobs:
WHL=`ls dist/*.whl`
echo "name=$WHL" >> $GITHUB_OUTPUT
shell: bash
if: "${{ matrix.platform.name == 'sgx' }}"
if: "${{ matrix.platform.name == 'virtual' }}"

- name: "Upload Python Wheel"
uses: actions/upload-artifact@v4
with:
name: wheel
path: python/${{ steps.build_wheel.outputs.name }}
if: "${{ matrix.platform.name == 'sgx' }}"
if: "${{ matrix.platform.name == 'virtual' }}"

- name: "Build TS Package"
id: build_tstgz
Expand All @@ -228,14 +223,14 @@ jobs:
PKG=`ls *.tgz`
echo "name=$PKG" >> $GITHUB_OUTPUT
shell: bash
if: "${{ matrix.platform.name == 'sgx' }}"
if: "${{ matrix.platform.name == 'virtual' }}"

- name: "Upload TS Package"
uses: actions/upload-artifact@v4
with:
name: tstgz
path: js/ccf-app/${{ steps.build_tstgz.outputs.name }}
if: "${{ matrix.platform.name == 'sgx' }}"
if: "${{ matrix.platform.name == 'virtual' }}"

create_release:
needs:
Expand Down