Remove SGX target from release job(s) (#6492)

microsoft · Sep 20, 2024 · 1fb9dc4 · 1fb9dc4
1 parent b39fa24
commit 1fb9dc4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 20 deletions.
diff --git a/.github/workflows/containers-ghcr.yml b/.github/workflows/containers-ghcr.yml
@@ -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
@@ -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

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -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
@@ -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
@@ -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
@@ -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: