Skip to content

Commit

Permalink
Update workflow from branch
Browse files Browse the repository at this point in the history
  • Loading branch information
mallport committed Dec 4, 2024
1 parent 08fbe89 commit e0d4e85
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/.cruft.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"checkout": null,
"context": {
"cookiecutter": {
"repo_name": "pseudo-service",
"repo_name": "dapla-dlp-pseudo-service",
"team_uniform_name": "dapla-stat",
"program_type": "APPLICATION",
"java_version": "21",
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/build-deploy-app.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
on:
release:
types: [ published ]
pull_request: ## ONLY FOR TESTING, SHOULD BE REMOVED AFTER DEPLOY PR IS MERGED
branches: [nais-deploy]
push:
branches:
- master
Expand Down Expand Up @@ -52,10 +54,10 @@ jobs:

- name: Maven build and install
run: |
if [[ ${{github.event_name}} == "push" ]]; then
mvn --batch-mode -P dapla-artifact-registry deploy
else
if [[ ${{github.event_name}} == "release" ]]; then
mvn --batch-mode clean package
else
mvn --batch-mode -P dapla-artifact-registry deploy
fi
- name: Add optional extra tag
Expand Down

0 comments on commit e0d4e85

Please sign in to comment.