Skip to content

Commit

Permalink
Makes Salmiac workflow reusable (#2)
Browse files Browse the repository at this point in the history
* - init

* - reverted to stable compiler

* - switched to nightly toolchain

* - build fix

* - gitignore + more crates update

* - addiitonal crate
  • Loading branch information
nshyrei authored Feb 12, 2024
1 parent 51ef8cc commit e3b505e
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 15 deletions.
15 changes: 14 additions & 1 deletion .github/workflows/build-solution.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
name: Build Solution

on:
workflow_call:
secrets:
AWS_ACCESS_KEY_ID:
required: true
AWS_SECRET_ACCESS_KEY:
required: true
EC2_PRIVATE_SSH_KEY:
required: true
FORTANIX_API_KEY:
required: true
OVERLAYFS_UNIT_TEST_API_KEY:
required: true
push:
branches: [ "master" ]
pull_request:
Expand Down Expand Up @@ -35,9 +47,10 @@ jobs:
uses: aws-actions/[email protected]

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
uses: dtolnay/rust-toolchain@master
with:
targets: x86_64-unknown-linux-musl
toolchain: nightly

- name: Setup SSH
run: |
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/build/
/artifacts
/docker/staging
/tools/container-converter/target
vsock-proxy/target
enclave-startup/target
8 changes: 4 additions & 4 deletions api-model/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion run-application-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ echo "FORTANIX_API_KEY=$FORTANIX_API_KEY" >> docker-env
docker pull $TESTS_CONTAINER
docker save $TESTS_CONTAINER -o salmiac-tests-container.tar.gz

SSH_OPTS="-o StrictHostKeyChecking=no -o BatchMode=yes"
SSH_OPTS="-o StrictHostKeyChecking=no -o BatchMode=yes -o ServerAliveInterval=60"

echo "######### Copying tests container to Nitro VM. ###############"
scp $SSH_OPTS salmiac-tests-container.tar.gz $SSH_USERNAME_AWS@$VM_ADDRESS:~/salmiac-tests-container.tar.gz
Expand Down
8 changes: 4 additions & 4 deletions tools/container-converter/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 11 additions & 5 deletions vsock-proxy/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e3b505e

Please sign in to comment.