Skip to content

Commit 5e80c22

Browse files
committed
update to use correct params
1 parent 5f5dbd3 commit 5e80c22

File tree

1 file changed

+20
-10
lines changed

1 file changed

+20
-10
lines changed

.github/workflows/main.yml

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ jobs:
6969
- name: docker - mvn clean (cache .m2 in ./build/.m2/repository in repo dir)
7070
run: $DOCKER_COMMAND mvn clean -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -B -Dmaven.repo.local=./build/.m2/repository
7171
- name: docker - mvn package
72-
run: $DOCKER_COMMAND mvn package -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -B -Dmaven.repo.local=./build/.m2/repository
72+
run: $DOCKER_COMMAND mvn package -DskipTests=true -Dgpg.skip -B -Dmaven.repo.local=./build/.m2/repository
7373

7474
- name: docker - sonar qube on master
7575
if: github.ref == 'refs/heads/master'
7676
run: mvn sonar:sonar -q "-Dsonar.branch.name=${GITHUB_REF}" "-Dsonar.host.url=${SONAR_URL}" "-Dsonar.login=${SONAR_TOKEN}" "-Dsonar.organization=${SONAR_ORGANISATION}"
77-
- name: docker - sonar qube on master
77+
- name: docker - sonar qube on branches
7878
if: github.ref != 'refs/heads/master'
7979
run: mvn sonar:sonar -q "-Dsonar.branch.name=${GITHUB_REF}" "-Dsonar.branch.target=master" "-Dsonar.host.url=${SONAR_URL}" "-Dsonar.login=${SONAR_TOKEN}" "-Dsonar.organization=${SONAR_ORGANISATION}"
8080

@@ -85,18 +85,28 @@ jobs:
8585
if: github.ref == 'refs/heads/master'
8686
run: $DOCKER_COMMAND echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import && echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust && mvn clean deploy --settings default.xml -B -P release
8787

88-
- uses: meeDamian/[email protected]
88+
- name: deploying with following params
89+
run: |
90+
echo "GIT_RELEASE_NOTES"
91+
echo "===START==="
92+
echo $GIT_RELEASE_NOTES
93+
echo "====END===="
94+
echo GITHUB_TAG=$GITHUB_TAG
95+
96+
- name: deploy github release with tag ${{ env.GITHUB_TAG }}
97+
uses: meeDamian/[email protected]
8998
if: github.ref == 'refs/heads/master'
9099
with:
91100
token: ${{ secrets.GITHUB_TOKEN }}
92-
tag: ${CURRENT_VERSION}
93-
name: ${CURRENT_VERSION}
94-
body: $GIT_RELEASE_NOTES
101+
tag: ${{ env.CURRENT_VERSION }}
102+
name: ${{ env.CURRENT_VERSION }}
103+
body: ${{ env.GIT_RELEASE_NOTES }}
95104
files: >
96-
aemdesign-aem-core-deploy/target/aemdesign-aem-core-deploy-$CURRENT_VERSION.zip
97-
aemdesign-aem-services/target/aemdesign-aem-services-$CURRENT_VERSION.jar
98-
aemdesign-aem-author/target/aemdesign-aem-author-$CURRENT_VERSION.zip
99-
aemdesign-aem-common/target/aemdesign-aem-common-$CURRENT_VERSION.zip
105+
**/target/*.zip
106+
env:
107+
GIT_RELEASE_NOTES: ${{ env.GIT_RELEASE_NOTES }}
108+
GITHUB_TAG: ${{ env.GITHUB_TAG }}
109+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
100110

101111
- name: trigger build of bundle docker container
102112
if: github.ref == 'refs/heads/master'

0 commit comments

Comments
 (0)