From 47d03d20e8b3417ab63f04df5ba9051182414c31 Mon Sep 17 00:00:00 2001 From: Kahtaf Alam Date: Tue, 12 Nov 2024 16:30:46 -0500 Subject: [PATCH 1/6] fix: pin gsc to v1.7 to fix signing failures --- .github/workflows/build-and-release.yml | 5 +++-- .gitignore | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 506fbdb..6feb60b 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -2,7 +2,8 @@ name: Build and Release on: push: - branches: [main] + # branches: [main] + branches: ['*'] pull_request: branches: [main] @@ -36,7 +37,7 @@ jobs: - name: Clone and set up GSC run: | - git clone https://github.com/gramineproject/gsc.git + git clone --branch v1.7 https://github.com/gramineproject/gsc.git cd gsc python3 -m pip install --no-cache-dir 'docker>=7.1.0' 'jinja2>=3.1.4' 'tomli>=2.0.1' 'tomli-w>=1.0.0' 'pyyaml>=6.0.2' diff --git a/.gitignore b/.gitignore index 965e165..3e45720 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ demo/* !demo/input/ .idea/ + +.DS_Store \ No newline at end of file From 89e4d4261e1014bb5335c57a85b8da04fdd891a1 Mon Sep 17 00:00:00 2001 From: Kahtaf Alam Date: Tue, 12 Nov 2024 16:47:09 -0500 Subject: [PATCH 2/6] revert pin to v1.7 --- .github/workflows/build-and-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 6feb60b..eb84f9c 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -37,7 +37,7 @@ jobs: - name: Clone and set up GSC run: | - git clone --branch v1.7 https://github.com/gramineproject/gsc.git + git clone https://github.com/gramineproject/gsc.git cd gsc python3 -m pip install --no-cache-dir 'docker>=7.1.0' 'jinja2>=3.1.4' 'tomli>=2.0.1' 'tomli-w>=1.0.0' 'pyyaml>=6.0.2' From 54ce4763c96f7d6769d8e8b1e1c13f817397bce9 Mon Sep 17 00:00:00 2001 From: Kahtaf Alam Date: Wed, 13 Nov 2024 13:52:29 -0500 Subject: [PATCH 3/6] Attempt to use different repo with fix that's not yet merged --- .github/workflows/build-and-release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index eb84f9c..af7defb 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -37,7 +37,8 @@ jobs: - name: Clone and set up GSC run: | - git clone https://github.com/gramineproject/gsc.git + # git clone https://github.com/gramineproject/gsc.git + git clone -b kailun-qin/rm-loader-entrypoint https://github.com/kailun-qin/gsc.git cd gsc python3 -m pip install --no-cache-dir 'docker>=7.1.0' 'jinja2>=3.1.4' 'tomli>=2.0.1' 'tomli-w>=1.0.0' 'pyyaml>=6.0.2' From a6c587268c78dd4a059b93b28132a7ac069f2eb4 Mon Sep 17 00:00:00 2001 From: Kahtaf Alam Date: Wed, 13 Nov 2024 14:01:58 -0500 Subject: [PATCH 4/6] Clean up github actions --- .github/workflows/build-and-release.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index af7defb..8b78a8c 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -2,8 +2,7 @@ name: Build and Release on: push: - # branches: [main] - branches: ['*'] + branches: [main] pull_request: branches: [main] @@ -37,7 +36,6 @@ jobs: - name: Clone and set up GSC run: | - # git clone https://github.com/gramineproject/gsc.git git clone -b kailun-qin/rm-loader-entrypoint https://github.com/kailun-qin/gsc.git cd gsc python3 -m pip install --no-cache-dir 'docker>=7.1.0' 'jinja2>=3.1.4' 'tomli>=2.0.1' 'tomli-w>=1.0.0' 'pyyaml>=6.0.2' From b8ccb05b75c499897f52bbd9b67ecb7704c9baa5 Mon Sep 17 00:00:00 2001 From: Kahtaf Alam Date: Mon, 2 Dec 2024 23:40:51 -0500 Subject: [PATCH 5/6] Update build to fix SGX Driver failure --- .github/workflows/build-and-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 8b78a8c..c6d3b0c 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -36,7 +36,7 @@ jobs: - name: Clone and set up GSC run: | - git clone -b kailun-qin/rm-loader-entrypoint https://github.com/kailun-qin/gsc.git + git clone -b adarsh/new-sgx-driver https://github.com/adarshan-intel/gsc.git cd gsc python3 -m pip install --no-cache-dir 'docker>=7.1.0' 'jinja2>=3.1.4' 'tomli>=2.0.1' 'tomli-w>=1.0.0' 'pyyaml>=6.0.2' @@ -109,4 +109,4 @@ jobs: echo "Build and release completed successfully" else echo "Build and release failed" - fi \ No newline at end of file + fi From 6a8a630758f30deec1c32c54769bb37f80ba97dd Mon Sep 17 00:00:00 2001 From: Kahtaf Alam Date: Mon, 16 Dec 2024 07:06:03 +0000 Subject: [PATCH 6/6] add loader.entrypoint --- my-proof.manifest.template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/my-proof.manifest.template b/my-proof.manifest.template index 0b2d7f8..3ae5059 100644 --- a/my-proof.manifest.template +++ b/my-proof.manifest.template @@ -29,3 +29,5 @@ fs.mounts = [ # You can add other Gramine-manifest-compatible options as needed, see the # Gramine documentation for more details: https://gramine.readthedocs.io. Note # that gsc defines a number of manifest settings by default. + +loader.entrypoint = { path = "/my_proof/__main__.py" } \ No newline at end of file