Skip to content

Commit

Permalink
Split GitHub and Cirun calls into separate workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
kendal committed Jun 17, 2024
1 parent f2aecf9 commit f5d3554
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 65 deletions.
24 changes: 24 additions & 0 deletions .github/workflows/pull-request-swift-toolchain-cirun.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Pull Request - Development Snapshot (Cirun)

on:
pull_request:
branches:
- 'main'
files:
- '.github/workflows/swift-toolchain.yml'

workflow_dispatch:

jobs:
call_development_snapshot:
name: Development Snapshot
uses: ./.github/workflows/swift-toolchain.yml
with:
publish_artifacts: false
default_runner: "cirun-win11-23h2-pro-arm64-16-2024-05-17"
compilers_runner: "cirun-win11-23h2-pro-arm64-64-2024-05-17"
secrets: inherit
permissions:
contents: read
pull-requests: read

24 changes: 24 additions & 0 deletions .github/workflows/pull-request-swift-toolchain-github.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Pull Request - Development Snapshot (GitHub)

on:
pull_request:
branches:
- 'main'
files:
- '.github/workflows/swift-toolchain.yml'

workflow_dispatch:

jobs:
call_development_snapshot:
name: Development Snapshot
uses: ./.github/workflows/swift-toolchain.yml
with:
publish_artifacts: false
default_runner: "swift-build-windows-latest-8-cores"
compilers_runner: "swift-build-windows-latest-64-cores"
secrets: inherit
permissions:
contents: read
pull-requests: read

61 changes: 0 additions & 61 deletions .github/workflows/pull-request-swift-toolchain.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/schedule-swift-toolchain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
name: Development Snapshot
uses: ./.github/workflows/swift-toolchain.yml
with:
dry_run: false
publish_artifacts: true
default_runner: ${{ vars.USE_CIRUN && 'cirun-win11-23h2-pro-arm64-16-2024-05-17' || 'swift-build-windows-latest-8-cores' }}
compilers_runner: ${{ vars.USE_CIRUN && 'cirun-win11-23h2-pro-arm64-64-2024-05-17' || 'swift-build-windows-latest-64-cores' }}
secrets: inherit
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/swift-toolchain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ on:
type: string

compilers_runner:
description: 'The runner to use for building the compilers in this worflow. If unset, uses default_runner'
description: 'The runner to use for building the compilers in this workflow. If unset, uses default_runner'
type: string
required: false

Expand Down Expand Up @@ -81,7 +81,7 @@ on:
type: string

compilers_runner:
description: 'The runner to use for building the compilers in this worflow. If unset, uses default_runner'
description: 'The runner to use for building the compilers in this workflow. If unset, uses default_runner'
type: string
required: false

Expand Down Expand Up @@ -249,7 +249,6 @@ jobs:
echo compilers_build_runner=${{ inputs.compilers_runner || inputs.default_runner }} >> ${GITHUB_OUTPUT}
- uses: actions/upload-artifact@v4
if: inputs.dry_run != true
with:
name: stable.xml
path: stable.xml
Expand Down

0 comments on commit f5d3554

Please sign in to comment.