Skip to content

Commit

Permalink
Merge pull request #36 from amido/feature/sonar-project
Browse files Browse the repository at this point in the history
  • Loading branch information
ElvenSpellmaker authored Aug 11, 2021
2 parents 2389199 + 82777d3 commit 3fcea24
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions build/azDevOps/azure/azure-pipelines-javaspring-k8s.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
name: "$(Build.SourceBranchName)-init"

pr:
- master
- main

trigger:
branches:
include:
- 'master'
- 'main'
paths:
include:
- '*'
Expand Down Expand Up @@ -58,7 +58,7 @@ variables:
# SelfConfig
# If you haven't specified source_repo at cli runtime please ensure you replace it here
# It is case sensitive for TFS based repos
self_repo: stacks-java
self_repo: stacks-java-cqrs-events
self_remote_repo: "amido/$(self_repo)"
self_repo_src: java
self_post_deploy_test_src: "api-tests"
Expand All @@ -79,7 +79,7 @@ variables:
# there are some best practices around this if you are going for feature based environments
# - we suggest you create a runtime variable that is dynamically set based on a branch currently running
# **`terraform_state_workspace: `**
# avoid running anything past dev that is not on master
# avoid running anything past dev that is not on main
# sample value: company-webapp
tf_state_key: "stacks-api-java"
# Environment
Expand Down Expand Up @@ -145,6 +145,7 @@ stages:
- group: amido-stacks-infra-credentials-nonprod
- group: stacks-credentials-nonprod-kv
- group: amido-stacks-java-api
- group: amido-stacks-java-cqrs-events-api
jobs:
- job: ApiBuild
pool:
Expand Down Expand Up @@ -273,7 +274,7 @@ stages:

- stage: Dev
dependsOn: Build
condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/master'))
condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/main'))
variables:
- group: amido-stacks-infra-credentials-nonprod
- group: stacks-credentials-nonprod-kv
Expand Down Expand Up @@ -496,7 +497,7 @@ stages:

- stage: Prod
dependsOn: Build
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
variables:
- group: amido-stacks-infra-credentials-prod
- group: stacks-credentials-prod-kv
Expand Down
Empty file modified java/mvnw
100644 → 100755
Empty file.

0 comments on commit 3fcea24

Please sign in to comment.