Skip to content

Commit

Permalink
silly github won't allow reusable locals not in workflows directory a…
Browse files Browse the repository at this point in the history
…nd MUST be flat structure
  • Loading branch information
joroshiba committed Feb 6, 2024
1 parent 9ad9e00 commit 82a6051
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/admin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ jobs:
admin:
if: ${{ always() && !cancelled() }}
needs: [pr_title]
uses: ./.github/reusable/success.yml
uses: ./.github/workflows/reusable-success.yml
with:
success: ${{ !contains(needs.*.result, 'failure') }}
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,33 +12,33 @@ on:
jobs:
# TODO: Make generic and run on any tagged release
cli:
uses: './.github/reusable/build.yml'
uses: './.github/workflows/reusable-build.yml'
with:
package-name: 'cli'

conductor:
uses: './.github/reusable/build.yml'
uses: './.github/workflows/reusable-build.yml'
with:
package-name: 'conductor'

composer:
uses: './.github/reusable/build.yml'
uses: './.github/workflows/reusable-build.yml'
with:
package-name: 'conductor'

sequencer:
uses: './.github/reusable/build.yml'
uses: './.github/workflows/reusable-build.yml'
with:
package-name: 'sequencer'

relayer:
uses: './.github/reusable/build.yml'
uses: './.github/workflows/reusable-build.yml'
with:
package-name: 'sequencer-relayer'

build:
if: ${{ always() && !cancelled() }}
needs: [cli, composer, conductor, sequencer, relayer]
uses: ./.github/reusable/success.yml
uses: ./.github/workflows/reusable-success.yml
with:
success: ${{ !contains(needs.*.result, 'failure') }}
12 changes: 6 additions & 6 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ on:

jobs:
run_checker:
uses: ./.github/reusable/run-checker.yml
uses: ./.github/workflows/reusable-run-checker.yml

composer:
needs: run_checker
if: needs.run_checker.outputs.run_docker == 'true'
uses: './.github/reusable/docker-build.yml'
uses: './.github/workflows/reusable-docker-build.yml'
with:
package-name: composer
target-binary: astria-composer
Expand All @@ -37,7 +37,7 @@ jobs:
conductor:
needs: run_checker
if: needs.run_checker.outputs.run_docker == 'true'
uses: './.github/reusable/docker-build.yml'
uses: './.github/workflows/reusable-docker-build.yml'
with:
package-name: conductor
target-binary: astria-conductor
Expand All @@ -46,7 +46,7 @@ jobs:
sequencer:
needs: run_checker
if: needs.run_checker.outputs.run_docker == 'true'
uses: './.github/reusable/docker-build.yml'
uses: './.github/workflows/reusable-docker-build.yml'
with:
package-name: sequencer
target-binary: astria-sequencer
Expand All @@ -55,7 +55,7 @@ jobs:
sequencer-relayer:
needs: run_checker
if: needs.run_checker.outputs.run_docker == 'true'
uses: './.github/reusable/docker-build.yml'
uses: './.github/workflows/reusable-docker-build.yml'
with:
package-name: sequencer-relayer
target-binary: astria-sequencer-relayer
Expand All @@ -64,6 +64,6 @@ jobs:
docker:
if: ${{ always() && !cancelled() }}
needs: [composer, conductor, sequencer, sequencer-relayer]
uses: ./.github/reusable/success.yml
uses: ./.github/workflows/reusable-success.yml
with:
success: ${{ !contains(needs.*.result, 'failure') }}
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
run_checker:
uses: ./.github/reusable/run-checker.yml
uses: ./.github/workflows/reusable-run-checker.yml

proto:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -73,6 +73,6 @@ jobs:
lint:
needs: [proto, rust, toml, markdown]
if: ${{ always() && !cancelled() }}
uses: ./.github/reusable/success.yml
uses: ./.github/workflows/reusable-success.yml
with:
success: ${{ !contains(needs.*.result, 'failure') }}
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
run_checker:
uses: ./.github/reusable/run-checker.yml
uses: ./.github/workflows/reusable-run-checker.yml

proto:
runs-on: ubuntu-latest
Expand All @@ -29,46 +29,46 @@ jobs:
conductor:
needs: run_checker
if: needs.run_checker.outputs.run_release_services == 'true'
uses: ./.github/reusable/release-cargo.yml
uses: ./.github/workflows/reusable-release-cargo.yml
with:
package-name: 'conductor'
display-name: 'Conductor'

composer:
needs: run_checker
if: needs.run_checker.outputs.run_release_services == 'true'
uses: ./.github/reusable/release-cargo.yml
uses: ./.github/workflows/reusable-release-cargo.yml
with:
package-name: 'composer'
display-name: 'Composer'

sequencer:
needs: run_checker
if: needs.run_checker.outputs.run_release_services == 'true'
uses: ./.github/reusable/release-cargo.yml
uses: ./.github/workflows/reusable-release-cargo.yml
with:
package-name: 'sequencer'
display-name: 'Sequencer'

sequencer-relayer:
needs: run_checker
if: needs.run_checker.outputs.run_release_services == 'true'
uses: ./.github/reusable/release-cargo.yml
uses: ./.github/workflows/reusable-release-cargo.yml
with:
package-name: 'sequencer-relayer'
display-name: 'Sequencer Relayer'

cli:
needs: run_checker
if: needs.run_checker.outputs.run_release_services == 'true'
uses: ./.github/reusable/release-cargo.yml
uses: ./.github/workflows/reusable-release-cargo.yml
with:
package-name: 'cli'
display-name: 'CLI'

release:
needs: [proto, conductor, composer, sequencer, sequencer-relayer, cli]
if: ${{ always() && !cancelled() }}
uses: ./.github/reusable/success.yml
uses: ./.github/workflows/reusable-success.yml
with:
success: ${{ !contains(needs.*.result, 'failure') }}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
run_checker:
uses: ./.github/reusable/run-checker.yml
uses: ./.github/workflows/reusable-run-checker.yml

protos-compiled:
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -230,6 +230,6 @@ jobs:
test:
if: ${{ always() && !cancelled() }}
needs: [compiles, protos-compiled, rust, doctest, clippy, lockfile, custom-lints, cargo-toml-synced-with-containerfiles]
uses: ./.github/reusable/success.yml
uses: ./.github/workflows/reusable-success.yml
with:
success: ${{ !contains(needs.*.result, 'failure') }}

0 comments on commit 82a6051

Please sign in to comment.