From 467f77f73cd8eae3e228e43ef050ef5e85157d08 Mon Sep 17 00:00:00 2001 From: John Haynes Date: Wed, 24 Apr 2024 16:00:23 -0600 Subject: [PATCH] Confirm tests correctly pull plugins with generic vars --- .github/workflows/linux-push.yml | 5 +++-- ci/common | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux-push.yml b/.github/workflows/linux-push.yml index f30e7fc7f..5891bc8f8 100644 --- a/.github/workflows/linux-push.yml +++ b/.github/workflows/linux-push.yml @@ -3,6 +3,7 @@ on: push: branches: - 'develop' + - 'ci/tag-previous-s3-objects' workflow_dispatch: inputs: runTests: @@ -14,9 +15,9 @@ permissions: contents: read # This is required for actions/checkout jobs: call_workflow: - uses: febiosoftware/febio-workflows/.github/workflows/linux-reusable-push.yml@develop + uses: febiosoftware/febio-workflows/.github/workflows/linux-reusable-push.yml@ci/use-latest-sdk with: - runTests: ${{ (github.event_name == 'workflow_dispatch' && inputs.runTests) || (github.event_name == 'push' && contains(fromJSON('["develop"]'), github.ref_name)) }} + runTests: ${{ (github.event_name == 'workflow_dispatch' && inputs.runTests) || (github.event_name == 'push' && contains(fromJSON('["develop", "ci/tag-previous-s3-objects"]'), github.ref_name)) }} package-name: febio4 package-sdk: true aws-ami-id: ami-0590ebdb5afffb782 diff --git a/ci/common b/ci/common index db45ce2e4..533da000e 160000 --- a/ci/common +++ b/ci/common @@ -1 +1 @@ -Subproject commit db45ce2e460ec29e81913d741d3cae567c8cc8eb +Subproject commit 533da000e4288b61f4fada00beaa31c793fbcbe0