From dc668f488c76ed0dd23074501d6e572aaef9b612 Mon Sep 17 00:00:00 2001 From: Hanno Becker Date: Wed, 11 Sep 2024 12:16:07 +0100 Subject: [PATCH] Fix EC2 CI workflow Signed-off-by: Hanno Becker --- .github/workflows/ci_ec2_any.yml | 2 +- .github/workflows/ci_ec2_reusable.yml | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci_ec2_any.yml b/.github/workflows/ci_ec2_any.yml index da75dde4e..a8cae8108 100644 --- a/.github/workflows/ci_ec2_any.yml +++ b/.github/workflows/ci_ec2_any.yml @@ -39,7 +39,7 @@ jobs: ec2_instance_type: ${{ github.event.inputs.ec2_instance_type }} ec2_ami_id: ${{ github.event.inputs.ec2_ami_id }} cflags: ${{ github.event.inputs.cflags }} - crosss-prefix: ${{ github.event.inputs.cross-prefix }} + cross-prefix: ${{ github.event.inputs.cross-prefix }} functest: ${{ github.event.inputs.functest }} lint: ${{ github.event.inputs.lint }} cbmc: ${{ github.event.inputs.cbmc }} diff --git a/.github/workflows/ci_ec2_reusable.yml b/.github/workflows/ci_ec2_reusable.yml index 14cfc10f5..f5720ae23 100644 --- a/.github/workflows/ci_ec2_reusable.yml +++ b/.github/workflows/ci_ec2_reusable.yml @@ -29,13 +29,13 @@ on: description: Indicates if instance should always be terminated, even on failure default: 'true' functest: - type: boolean + type: string default: 'true' lint: - type: boolean + type: string default: 'true' cbmc: - type: boolean + type: string default: 'false' env: AWS_ROLE: arn:aws:iam::559050233797:role/mlkem-c-aarch64-gh-action @@ -114,8 +114,10 @@ jobs: id-token: 'write' needs: - start-ec2-runner - - bench # required to wait when the main job is done - runs-on: ubuntu-latestn + - cbmc + - lint + - functest + runs-on: ubuntu-latest if: ${{ (inputs.always_terminate == 'true' && always()) || success() }} # required to stop the runner even if the error happened in the previous jobs steps: - name: Configure AWS credentials