From e9ee4d67baf95de5b0e91f6e4f150c2aecd7a2fc Mon Sep 17 00:00:00 2001 From: Patrick Robertson Date: Wed, 26 Mar 2025 15:09:24 +0400 Subject: [PATCH] Re-add 'ubuntu-latest' - now that we're rid of tsp_client --- .github/workflows/tests-core.yaml | 3 +-- .github/workflows/tests-download.yaml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests-core.yaml b/.github/workflows/tests-core.yaml index 57028bd..c839249 100644 --- a/.github/workflows/tests-core.yaml +++ b/.github/workflows/tests-core.yaml @@ -20,8 +20,7 @@ jobs: fail-fast: false matrix: python-version: ["3.10", "3.11", "3.12"] - os: [ubuntu-22.04] - #TODO: re-enable ubuntu-latest, this is disabled as oscrypto cannot be pinned to github commit and pushed to pypi + os: [ubuntu-22.04, ubuntu-latest] defaults: run: working-directory: ./ diff --git a/.github/workflows/tests-download.yaml b/.github/workflows/tests-download.yaml index 786b63d..a8337cf 100644 --- a/.github/workflows/tests-download.yaml +++ b/.github/workflows/tests-download.yaml @@ -7,7 +7,7 @@ on: # For PRs, run the tests-core workflow first workflow_run: - workflows: ["Core Tests"] # This should match the name of your tests-core workflow + workflows: ["Core Tests"] types: - completed branches: [main] @@ -30,7 +30,6 @@ jobs: steps: - uses: actions/checkout@v4 with: - # When triggered by workflow_run, we need to check out the PR code ref: ${{ github.event.workflow_run.head_branch || github.ref }} - name: Install poetry