Skip to content

Add sources subdirectory parameter to template #1154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 27, 2024
Merged

Add sources subdirectory parameter to template #1154

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64189dc
Add root directory parameter
Charles-Gagnon Nov 26, 2024
98be723
use subdirectory
Charles-Gagnon Nov 27, 2024
c72d32f
Fully qualify pom.xml
Charles-Gagnon Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 21 additions & 20 deletions builds/azure-pipelines/template-steps-build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ parameters:
binariesVersion: ''
testServer: ''
oopWorkerSupportedExtensionVersion: ''
sourcesSubdirectory: ''

steps:
- task: UseDotNet@2
Expand All @@ -22,21 +23,21 @@ steps:
- task: npmAuthenticate@0
displayName: 'npm Authenticate for project'
inputs:
workingFile: $(Build.SourcesDirectory)/.npmrc
workingFile: $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/.npmrc

- task: Npm@1
displayName: 'Install Azure Functions Core Tools'
inputs:
command: 'custom'
customCommand: 'install azure-functions-core-tools --global --globalconfig $(Build.SourcesDirectory)/.npmrc --loglevel verbose'
workingDir: '$(Build.SourcesDirectory)'
customCommand: 'install azure-functions-core-tools --global --globalconfig $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/.npmrc --loglevel verbose'
workingDir: '$(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}'

- task: Npm@1
displayName: 'Install Azurite Local Storage Emulator'
inputs:
command: 'custom'
customCommand: 'install azurite --global --globalconfig $(Build.SourcesDirectory)/.npmrc --loglevel verbose'
workingDir: '$(Build.SourcesDirectory)'
customCommand: 'install azurite --global --globalconfig $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/.npmrc --loglevel verbose'
workingDir: '$(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}'

# This step is necessary because npm installs to a non-traditional location on Windows hosted agents
# For non-Windows agents we still want to ensure that we always get the correct location where the tools are installed
Expand All @@ -46,7 +47,7 @@ steps:

- bash: echo "##vso[task.setvariable variable=azureFunctionsExtensionBundlePath]$(func GetExtensionBundlePath)"
displayName: 'Set Azure Functions extension bundle path'
workingDirectory: $(Build.SourcesDirectory)/samples/samples-js
workingDirectory: $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/samples/samples-js

- task: DockerInstaller@0
displayName: Docker Installer
Expand All @@ -73,17 +74,17 @@ steps:
displayName: Set logging level
condition: and(succeeded(), ne(variables['AFSQLEXT_TEST_LOGLEVEL'], ''))


- script: |
npm install --userconfig $(Build.SourcesDirectory)/.npmrc --loglevel verbose
npm install --userconfig $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/.npmrc --loglevel verbose
npm run lint
workingDirectory: $(Build.SourcesDirectory)/samples/samples-js
workingDirectory: $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/samples/samples-js
displayName: Lint samples-js

- script: |
npm install --userconfig $(Build.SourcesDirectory)/.npmrc --loglevel verbose
npm install --userconfig $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/.npmrc --loglevel verbose
npm run lint
workingDirectory: $(Build.SourcesDirectory)/test/Integration/test-js
workingDirectory: $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/test/Integration/test-js
displayName: Lint test-js

- task: UsePythonVersion@0
Expand All @@ -96,18 +97,18 @@ steps:
pip3 install "pylint<3.0"
pip3 install pylintfileheader
pylint --recursive=yes .
workingDirectory: $(Build.SourcesDirectory)/samples/samples-python
workingDirectory: $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/samples/samples-python
displayName: Lint samples-python

- script: |
pip3 install -r requirements.txt
workingDirectory: $(Build.SourcesDirectory)/samples/samples-python
workingDirectory: $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/samples/samples-python
displayName: Install samples-python dependencies

- task: Maven@4
displayName: Build Java Samples
inputs:
mavenPomFile: samples/samples-java/pom.xml
mavenPomFile: $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/samples/samples-java/pom.xml
# batch-mode and Slf4jMavenTransferListener definition are used to make the build logging verbose
# update-snapshot forces a check for updated library dependencies
options: --batch-mode --define=org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --update-snapshots
Expand All @@ -116,7 +117,7 @@ steps:
- task: Maven@4
displayName: Build Java Tests
inputs:
mavenPomFile: test/Integration/test-java/pom.xml
mavenPomFile: $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/test/Integration/test-java/pom.xml
# batch-mode and Slf4jMavenTransferListener definition are used to make the build logging verbose
# update-snapshot forces a check for updated library dependencies
options: --batch-mode --define=org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --update-snapshots
Expand All @@ -130,7 +131,7 @@ steps:
inputs:
command: custom
custom: nuget
arguments: add source -n afsqlext.local $(Build.SourcesDirectory)/local-packages
arguments: add source -n afsqlext.local $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/local-packages
workingDirectory: $(Agent.WorkFolder)

- task: DotNetCoreCLI@2
Expand All @@ -144,15 +145,15 @@ steps:
- task: CopyFiles@2
displayName: 'Copy local Sql package to local-packages folder'
inputs:
sourceFolder: $(Build.SourcesDirectory)/src/bin/${{ parameters.configuration }}
sourceFolder: $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/src/bin/${{ parameters.configuration }}
contents: '*.nupkg'
targetFolder: $(Build.SourcesDirectory)/local-packages
targetFolder: $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/local-packages
overWrite: true

- task: CopyFiles@2
displayName: 'Copy Sql extension dll to Azure Functions extension bundle'
inputs:
sourceFolder: $(Build.SourcesDirectory)/src/bin/${{ parameters.configuration }}/netstandard2.0
sourceFolder: $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/src/bin/${{ parameters.configuration }}/netstandard2.0
contents: Microsoft.Azure.WebJobs.Extensions.Sql.dll
targetFolder: $(azureFunctionsExtensionBundlePath)/bin
overWrite: true
Expand Down Expand Up @@ -182,7 +183,7 @@ steps:
projects: '${{ parameters.solution }}'
# Skip any non .NET In-Proc integration tests. Otherwise, the following error will be thrown:
# System.InvalidOperationException : No data found for Microsoft.Azure.WebJobs.Extensions.Sql.Tests.Integration.SqlOutputBindingIntegrationTests.NoPropertiesThrows
arguments: --configuration ${{ parameters.configuration }} --filter "FullyQualifiedName!~NoPropertiesThrows & FullyQualifiedName!~AddProductWithSlashInColumnName" --collect "Code Coverage" -s $(Build.SourcesDirectory)/test/coverage.runsettings --no-build
arguments: --configuration ${{ parameters.configuration }} --filter "FullyQualifiedName!~NoPropertiesThrows & FullyQualifiedName!~AddProductWithSlashInColumnName" --collect "Code Coverage" -s $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/test/coverage.runsettings --no-build
condition: and(succeededOrFailed(), eq(variables['Agent.OS'], 'Windows_NT'))

- task: DotNetCoreCLI@2
Expand Down