Skip to content

Commit

Permalink
chore: Adding dependency to build-amplify-swift in release workflow. …
Browse files Browse the repository at this point in the history
…Also adding missing identifier to concurrency groups (#3170)
  • Loading branch information
ruisebas authored Aug 23, 2023
1 parent 88961a0 commit df39b06
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/build_amplify_swift.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Build | Amplify Swift
on:
workflow_call:
inputs:
identifier:
required: true
type: string
workflow_dispatch:
push:
branches-ignore:
Expand All @@ -11,7 +15,7 @@ permissions:
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
group: ${{ inputs.identifier || github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: ${{ github.ref_name != 'main'}}

jobs:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/deploy_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ jobs:
build-amplify-swift:
name: Build Amplify package
uses: ./.github/workflows/build_amplify_swift.yml
with:
identifier: 'workflow-call-build-amplify-swift'

unit-tests:
name: Run Plugins Unit Tests
Expand All @@ -33,7 +35,7 @@ jobs:
release:
environment: Release
name: Release new ${{ inputs.type }} version
needs: [unit-tests, fortify]
needs: [unit-tests, fortify, build-amplify-swift]
runs-on: macos-latest
env:
GITHUB_EMAIL: [email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fortify_scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ permissions:
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
group: ${{ inputs.identifier || github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: ${{ github.ref_name != 'main'}}

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ permissions:
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
group: ${{ inputs.identifier || github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: ${{ github.ref_name != 'main'}}

jobs:
Expand Down

0 comments on commit df39b06

Please sign in to comment.