Skip to content

Commit

Permalink
Update template syntax
Browse files Browse the repository at this point in the history
  • Loading branch information
Saadnajmi committed May 3, 2024
1 parent c3c2652 commit 936867b
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions .ado/apple-integration.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Integrate $(Date:yyyyMMdd).$(Rev:.r)
variables:
- template: variables/vars.yml
- template: /.ado/variables/vars.yml@self
trigger:
branches:
include:
Expand Down Expand Up @@ -28,7 +28,7 @@ jobs:
timeoutInMinutes: 60
cancelTimeoutInMinutes: 5
steps:
- template: templates/apple-tools-setup.yml
- template: /.ado/templates/apple-tools-setup.yml@self
parameters:
slice_name: $(slice_name)
xcode_version: $(xcode_version)
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
cat package.json | jq .devDependencies
displayName: Modify example app dependencies
workingDirectory: react-native-test-app/example
- template: templates/verdaccio-init.yml
- template: /.ado/templates/verdaccio-init.yml@self
- bash: |
npx beachball publish --branch origin/$(System.PullRequest.TargetBranch) --no-push --registry http://localhost:4873 --yes --access public
displayName: Publish beachball packages to verdaccio
Expand Down
10 changes: 5 additions & 5 deletions .ado/apple-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: $(Date:yyyyMMdd).$(Rev:.r)

variables:
- template: variables/vars.yml
- template: /.ado/variables/vars.yml@self

trigger: none # will disable CI builds entirely

Expand All @@ -22,7 +22,7 @@ jobs:
vmImage: $(VmImageApple)
demands: ['xcode', 'sh', 'npm']
steps:
- template: templates/apple-job-javascript.yml
- template: /.ado/templates/apple-job-javascript.yml@self
parameters:
slice_name: $(slice_name)
xcode_version: $(xcode_version)
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
timeoutInMinutes: 90 # how long to run the job before automatically cancelling
cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them
steps:
- template: templates/apple-job-react-native.yml
- template: /.ado/templates/apple-job-react-native.yml@self
parameters:
packager_platform: $(packager_platform)
xcode_sdk: $(xcode_sdk)
Expand All @@ -133,7 +133,7 @@ jobs:
vmImage: $(VmImageApple)
demands: ['xcode', 'sh', 'npm']
steps:
- template: templates/react-native-macos-init.yml
- template: /.ado/templates/react-native-macos-init.yml@self
parameters:
configuration: $(configuration)

Expand All @@ -151,6 +151,6 @@ jobs:
submodules: recursive # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
persistCredentials: true # set to 'true' to leave the OAuth token in the Git config after the initial fetch

- template: templates/apple-job-publish.yml
- template: /.ado/templates/apple-job-publish.yml@self
parameters:
build_type: 'dry-run'
2 changes: 1 addition & 1 deletion .ado/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ trigger:
pr: none

variables:
- template: variables/vars.yml
- template: /.ado/variables/vars.yml@self
- group: React-native-macos Secrets
- group: InfoSec-SecurityResults
- name: tags
Expand Down
2 changes: 1 addition & 1 deletion .ado/templates/apple-job-javascript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ parameters:
xcode_version: ''

steps:
- template: apple-tools-setup.yml
- template: /.ado/templates/apple-tools-setup.yml@self
parameters:
slice_name: ${{ parameters.slice_name }}
xcode_version: ${{ parameters.xcode_version }}
Expand Down
2 changes: 1 addition & 1 deletion .ado/templates/apple-job-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ parameters:
build_type: ''

steps:
- template: apple-tools-setup.yml
- template: /.ado/templates/apple-tools-setup.yml@self

# Extra steps needed for *-stable releases
- ${{ if eq( parameters['build_type'], 'release') }}:
Expand Down
2 changes: 1 addition & 1 deletion .ado/templates/apple-job-react-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ parameters:
use_hermes: ''

steps:
- template: apple-tools-setup.yml
- template: /.ado/templates/apple-tools-setup.yml@self
parameters:
slice_name: ${{ parameters.slice_name }}
xcode_version: ${{ parameters.xcode_version }}
Expand Down
2 changes: 1 addition & 1 deletion .ado/templates/apple-tools-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ steps:
cat .ado/Brewfile.lock.json
- ${{ if ne(parameters.xcode_version, '')}}:
- template: apple-xcode-select.yml
- template: /.ado/templates/apple-xcode-select.yml@self
parameters:
slice_name: ${{ parameters.slice_name }}
xcode_version: ${{ parameters.xcode_version }}
Expand Down
6 changes: 3 additions & 3 deletions .ado/templates/react-native-macos-init.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ steps:
submodules: false # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
persistCredentials: false # set to 'true' to leave the OAuth token in the Git config after the initial fetch

- template: apple-tools-setup.yml
- template: /.ado/templates/apple-tools-setup.yml@self

- template: verdaccio-init.yml
- template: verdaccio-publish.yml
- template: /.ado/templates/verdaccio-init.yml@self
- template: /.ado/templates/verdaccio-publish.yml@self

# First do a build of the local package, since we point the cli at the local files, it needs to be pre-built
- task: CmdLine@2
Expand Down

0 comments on commit 936867b

Please sign in to comment.