Skip to content

Commit

Permalink
Fix workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
ffried committed Sep 2, 2024
1 parent d8e5905 commit 0fcb32f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/swift-generate-and-publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ on:
description: A command to run before the documentation is generated. This is only run if the documentation is generated in a container.
required: false
type: string
deprecationMessage: Use `before-run` instead
# deprecationMessage: Use `before-run` instead

permissions:
contents: write
Expand Down Expand Up @@ -124,14 +124,16 @@ jobs:
xcode-version: ${{ needs.basic-context.outputs.xcode-version }}
- uses: sersoft-gmbh/swift-version-action@v3
id: swift-version
- name: Run (legacy) before command
- name: Run before command
if: ${{ inputs.before-run != '' }}
env:
IS_IN_CONTAINER: ${{ needs.basic-context.outputs.build-container && 1 || 0 }}
run: ${{ inputs.before-run }}
- name: Run (legacy) before command
if: ${{ runner.os != 'macOS' && inputs.container-before-run != '' }}
run: ${{ inputs.container-before-run }}
run: |
echo '::warning::The container-before-run input is deprecated! Use before-run instead!'
${{ inputs.container-before-run }}
- uses: actions/checkout@v4
- uses: actions/cache@v4
if: ${{ runner.os != 'macOS' || inputs.xcode-destination == '' }}
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/swift-test-spm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ on:
description: A command to run before the tests are run. This is only run in a container.
required: false
type: string
deprecationMessage: Use before-run instead!
# deprecated!

secrets:
CODECOV_TOKEN:
description: The token to use for uploading to codecov.
Expand Down Expand Up @@ -92,7 +93,9 @@ jobs:
run: ${{ inputs.before-run }}
- name: Run (legacy) before command
if: ${{ runner.os != 'macOS' && inputs.container-before-run != '' }}
run: ${{ inputs.container-before-run }}
run: |
echo '::warning::The container-before-run input is deprecated! Use before-run instead!'
${{ inputs.container-before-run }}
- uses: sersoft-gmbh/oss-common-actions/swift/test/spm@main
if: ${{ runner.os != 'macOS' || needs.determine-versions.outputs.xcode-version-supported == 'true' }}
with:
Expand Down

0 comments on commit 0fcb32f

Please sign in to comment.