From f1a124df571566969cc101dbb40eca1c63c671b6 Mon Sep 17 00:00:00 2001 From: awalsh128 Date: Mon, 5 Jan 2026 17:50:30 -0800 Subject: [PATCH] stuff 2 --- .github/workflows/action-tests.yml | 43 +++++++++++------------------- 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/.github/workflows/action-tests.yml b/.github/workflows/action-tests.yml index f45d521..c4730e7 100644 --- a/.github/workflows/action-tests.yml +++ b/.github/workflows/action-tests.yml @@ -17,29 +17,16 @@ env: SHELLOPTS: errexit:pipefail jobs: - check_distribute: + build_binaries: runs-on: ubuntu-latest - outputs: - distribute_exists: ${{ steps.check_distribute.outputs.distribute_exists }} + name: Build binaries steps: - uses: actions/checkout@v4 - - name: Check if distribute directory exists - id: check_distribute - run: | - if [ -d "distribute" ]; then - echo "distribute_exists=false" >> $GITHUB_OUTPUT - else - echo "distribute_exists=false" >> $GITHUB_OUTPUT - fi + - uses: ./.github/workflows/build-distribute.yml - build_distribute: - needs: check_distribute - if: needs.check_distribute.outputs.distribute_exists == 'false' - uses: ./.github/workflows/build-distribute.yml - - # All other jobs should depend on build_distribute (if run) or check_distribute (if not needed) + # All other jobs should depend on build_binaries (if run) or check_distribute (if not needed) list_all_versions: - needs: [build_distribute, check_distribute] + needs: [build_binaries] runs-on: ubuntu-latest name: List all package versions (including deps). steps: @@ -65,7 +52,7 @@ jobs: shell: bash list_versions: - needs: [build_distribute, check_distribute] + needs: [build_binaries] runs-on: ubuntu-latest name: List package versions. steps: @@ -90,7 +77,7 @@ jobs: shell: bash standard_workflow_install: - needs: [build_distribute, check_distribute] + needs: [build_binaries] runs-on: ubuntu-latest name: Standard workflow install package and cache. steps: @@ -110,7 +97,7 @@ jobs: shell: bash standard_workflow_install_with_new_version: - needs: [standard_workflow_install, build_distribute, check_distribute] + needs: [standard_workflow_install, build_binaries] runs-on: ubuntu-latest name: Standard workflow packages with new version. steps: @@ -131,7 +118,7 @@ jobs: shell: bash standard_workflow_restore: - needs: [standard_workflow_install, build_distribute, check_distribute] + needs: [standard_workflow_install, build_binaries] runs-on: ubuntu-latest name: Standard workflow restore cached packages. steps: @@ -151,7 +138,7 @@ jobs: shell: bash standard_workflow_restore_with_packages_out_of_order: - needs: [standard_workflow_install, build_distribute, check_distribute] + needs: [standard_workflow_install, build_binaries] runs-on: ubuntu-latest name: Standard workflow restore with packages out of order. steps: @@ -171,7 +158,7 @@ jobs: shell: bash standard_workflow_add_package: - needs: [standard_workflow_install, build_distribute, check_distribute] + needs: [standard_workflow_install, build_binaries] runs-on: ubuntu-latest name: Standard workflow add another package. steps: @@ -191,7 +178,7 @@ jobs: shell: bash standard_workflow_restore_add_package: - needs: [standard_workflow_add_package, build_distribute, check_distribute] + needs: [standard_workflow_add_package, build_binaries] runs-on: ubuntu-latest name: Standard workflow restore added package. steps: @@ -367,7 +354,7 @@ jobs: debug: ${{ env.DEBUG }} regression_84_literal_block_restore: - needs: [regression_84_literal_block_install, build_distribute, check_distribute] + needs: [regression_84_literal_block_install, build_binaries] runs-on: ubuntu-latest name: "Restore multiline package listing using literal block style (regression issue #84)." steps: @@ -400,7 +387,7 @@ jobs: debug: ${{ env.DEBUG }} regression_84_folded_block_restore: - needs: [regression_84_folded_block_install, build_distribute, check_distribute] + needs: [regression_84_folded_block_install, build_binaries] runs-on: ubuntu-latest name: "Restore multiline package listing using literal block style (regression issue #84)." steps: @@ -453,7 +440,7 @@ jobs: debug: ${{ env.DEBUG }} regression_106_restore: - needs: [regression_106_install, build_distribute, check_distribute] + needs: [regression_106_install, build_binaries] runs-on: ubuntu-latest name: "Stale apt repo not finding package on restore, restore phase (regression issue #106)." steps: