From 1034ac4eef8afa0550f001e915197303608a71b0 Mon Sep 17 00:00:00 2001 From: Ryan MacArthur Date: Thu, 5 Dec 2024 08:20:00 -0800 Subject: [PATCH 1/5] fixing ci scripts --- .github/workflows/ci.yml | 11 +++++------ .github/workflows/tee-ci.yml | 4 +--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5339e57bf..372fdd789 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -137,10 +137,9 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} files: lcov.info fail_ci_if_error: true - # trigger-deployment: + trigger-deployment: # doing this here due to feedback @ https://github.com/tlsnotary/tlsn/pull/631#issuecomment-2415806267 - # needs: tests-integration - # uses: ./.github/workflows/tee-cd.yml - # with: - # # what this is supposed to do -> $ref is the tag: e.g., v0.1.0-alpha.7; pass the $ref string to the cd script and update reverse proxy / deploy - # ref: ${{ github.ref_name }} + needs: tests-integration + uses: tlsnotary/tlsn/.github/workflows/tee-cd.yml@dev + with: + ref: ${{ github.ref_name }} diff --git a/.github/workflows/tee-ci.yml b/.github/workflows/tee-ci.yml index badacfaf6..89133b193 100644 --- a/.github/workflows/tee-ci.yml +++ b/.github/workflows/tee-ci.yml @@ -34,9 +34,7 @@ jobs: run: | echo "SCCACHE_GHA_ENABLED=true" >> $GITHUB_ENV echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV - - name: get emulated measurement (call gramine.sh without the sgx arg) working-directory: ${{ github.workspace }}/crates/notary/server/tee run: | - # this fails current ci because gramine.sh is part of this pr so the file doesnt exist - # bash .github/scripts/gramine.sh + bash ${{ github.workspace }}/.github/scripts/gramine.sh From b549ee83af6d38acee599b4ba904011cf247ffa4 Mon Sep 17 00:00:00 2001 From: mac Date: Thu, 5 Dec 2024 08:27:55 -0800 Subject: [PATCH 2/5] Update tee-ci.yml --- .github/workflows/tee-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/tee-ci.yml b/.github/workflows/tee-ci.yml index 89133b193..11889d4a2 100644 --- a/.github/workflows/tee-ci.yml +++ b/.github/workflows/tee-ci.yml @@ -37,4 +37,8 @@ jobs: - name: get emulated measurement (call gramine.sh without the sgx arg) working-directory: ${{ github.workspace }}/crates/notary/server/tee run: | + ls -la + pwd + git log + ls -la ${{ github.workspace }}/.github/scripts bash ${{ github.workspace }}/.github/scripts/gramine.sh From b5e41c0295c8d3291576cb0c60d05d49b9eb3699 Mon Sep 17 00:00:00 2001 From: mac Date: Thu, 5 Dec 2024 08:30:04 -0800 Subject: [PATCH 3/5] Update tee-ci.yml --- .github/workflows/tee-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tee-ci.yml b/.github/workflows/tee-ci.yml index 11889d4a2..6a1fe94b6 100644 --- a/.github/workflows/tee-ci.yml +++ b/.github/workflows/tee-ci.yml @@ -39,6 +39,5 @@ jobs: run: | ls -la pwd - git log ls -la ${{ github.workspace }}/.github/scripts bash ${{ github.workspace }}/.github/scripts/gramine.sh From 046ba71d0362a6891db5eeb0044b8b272a6c4248 Mon Sep 17 00:00:00 2001 From: mac Date: Thu, 5 Dec 2024 08:32:01 -0800 Subject: [PATCH 4/5] Update tee-ci.yml --- .github/workflows/tee-ci.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/tee-ci.yml b/.github/workflows/tee-ci.yml index 6a1fe94b6..645621241 100644 --- a/.github/workflows/tee-ci.yml +++ b/.github/workflows/tee-ci.yml @@ -37,7 +37,4 @@ jobs: - name: get emulated measurement (call gramine.sh without the sgx arg) working-directory: ${{ github.workspace }}/crates/notary/server/tee run: | - ls -la - pwd - ls -la ${{ github.workspace }}/.github/scripts - bash ${{ github.workspace }}/.github/scripts/gramine.sh + bash ../../../../.github/scripts/gramine.sh From f321e75cb0c7344e4c5d2e5123726397bb53768c Mon Sep 17 00:00:00 2001 From: mac Date: Thu, 5 Dec 2024 16:40:23 -0800 Subject: [PATCH 5/5] ci: removed automatic workflow_dispatch trigger manual dispatch preferred --- .github/workflows/ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 372fdd789..01257c35d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -137,9 +137,3 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} files: lcov.info fail_ci_if_error: true - trigger-deployment: - # doing this here due to feedback @ https://github.com/tlsnotary/tlsn/pull/631#issuecomment-2415806267 - needs: tests-integration - uses: tlsnotary/tlsn/.github/workflows/tee-cd.yml@dev - with: - ref: ${{ github.ref_name }}