Skip to content

Commit f1a124d

Browse files
committed
stuff 2
1 parent d1802cb commit f1a124d

1 file changed

Lines changed: 15 additions & 28 deletions

File tree

.github/workflows/action-tests.yml

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,16 @@ env:
1717
SHELLOPTS: errexit:pipefail
1818

1919
jobs:
20-
check_distribute:
20+
build_binaries:
2121
runs-on: ubuntu-latest
22-
outputs:
23-
distribute_exists: ${{ steps.check_distribute.outputs.distribute_exists }}
22+
name: Build binaries
2423
steps:
2524
- uses: actions/checkout@v4
26-
- name: Check if distribute directory exists
27-
id: check_distribute
28-
run: |
29-
if [ -d "distribute" ]; then
30-
echo "distribute_exists=false" >> $GITHUB_OUTPUT
31-
else
32-
echo "distribute_exists=false" >> $GITHUB_OUTPUT
33-
fi
34-
35-
build_distribute:
36-
needs: check_distribute
37-
if: needs.check_distribute.outputs.distribute_exists == 'false'
38-
uses: ./.github/workflows/build-distribute.yml
25+
- uses: ./.github/workflows/build-distribute.yml
3926

40-
# All other jobs should depend on build_distribute (if run) or check_distribute (if not needed)
27+
# All other jobs should depend on build_binaries (if run) or check_distribute (if not needed)
4128
list_all_versions:
42-
needs: [build_distribute, check_distribute]
29+
needs: [build_binaries]
4330
runs-on: ubuntu-latest
4431
name: List all package versions (including deps).
4532
steps:
@@ -65,7 +52,7 @@ jobs:
6552
shell: bash
6653

6754
list_versions:
68-
needs: [build_distribute, check_distribute]
55+
needs: [build_binaries]
6956
runs-on: ubuntu-latest
7057
name: List package versions.
7158
steps:
@@ -90,7 +77,7 @@ jobs:
9077
shell: bash
9178

9279
standard_workflow_install:
93-
needs: [build_distribute, check_distribute]
80+
needs: [build_binaries]
9481
runs-on: ubuntu-latest
9582
name: Standard workflow install package and cache.
9683
steps:
@@ -110,7 +97,7 @@ jobs:
11097
shell: bash
11198

11299
standard_workflow_install_with_new_version:
113-
needs: [standard_workflow_install, build_distribute, check_distribute]
100+
needs: [standard_workflow_install, build_binaries]
114101
runs-on: ubuntu-latest
115102
name: Standard workflow packages with new version.
116103
steps:
@@ -131,7 +118,7 @@ jobs:
131118
shell: bash
132119

133120
standard_workflow_restore:
134-
needs: [standard_workflow_install, build_distribute, check_distribute]
121+
needs: [standard_workflow_install, build_binaries]
135122
runs-on: ubuntu-latest
136123
name: Standard workflow restore cached packages.
137124
steps:
@@ -151,7 +138,7 @@ jobs:
151138
shell: bash
152139

153140
standard_workflow_restore_with_packages_out_of_order:
154-
needs: [standard_workflow_install, build_distribute, check_distribute]
141+
needs: [standard_workflow_install, build_binaries]
155142
runs-on: ubuntu-latest
156143
name: Standard workflow restore with packages out of order.
157144
steps:
@@ -171,7 +158,7 @@ jobs:
171158
shell: bash
172159

173160
standard_workflow_add_package:
174-
needs: [standard_workflow_install, build_distribute, check_distribute]
161+
needs: [standard_workflow_install, build_binaries]
175162
runs-on: ubuntu-latest
176163
name: Standard workflow add another package.
177164
steps:
@@ -191,7 +178,7 @@ jobs:
191178
shell: bash
192179

193180
standard_workflow_restore_add_package:
194-
needs: [standard_workflow_add_package, build_distribute, check_distribute]
181+
needs: [standard_workflow_add_package, build_binaries]
195182
runs-on: ubuntu-latest
196183
name: Standard workflow restore added package.
197184
steps:
@@ -367,7 +354,7 @@ jobs:
367354
debug: ${{ env.DEBUG }}
368355

369356
regression_84_literal_block_restore:
370-
needs: [regression_84_literal_block_install, build_distribute, check_distribute]
357+
needs: [regression_84_literal_block_install, build_binaries]
371358
runs-on: ubuntu-latest
372359
name: "Restore multiline package listing using literal block style (regression issue #84)."
373360
steps:
@@ -400,7 +387,7 @@ jobs:
400387
debug: ${{ env.DEBUG }}
401388

402389
regression_84_folded_block_restore:
403-
needs: [regression_84_folded_block_install, build_distribute, check_distribute]
390+
needs: [regression_84_folded_block_install, build_binaries]
404391
runs-on: ubuntu-latest
405392
name: "Restore multiline package listing using literal block style (regression issue #84)."
406393
steps:
@@ -453,7 +440,7 @@ jobs:
453440
debug: ${{ env.DEBUG }}
454441

455442
regression_106_restore:
456-
needs: [regression_106_install, build_distribute, check_distribute]
443+
needs: [regression_106_install, build_binaries]
457444
runs-on: ubuntu-latest
458445
name: "Stale apt repo not finding package on restore, restore phase (regression issue #106)."
459446
steps:

0 commit comments

Comments
 (0)