Refactor GitLab CI stages and fix example IP address in CfDnsClient documentation
This commit is contained in:
+18
-22
@@ -44,20 +44,6 @@ on_commits:
|
||||
- merge_request
|
||||
- develop
|
||||
|
||||
pages:
|
||||
stage: deploy_pages
|
||||
dependencies:
|
||||
- javadoc
|
||||
script:
|
||||
- echo "deploying gitlab pages from docs/"
|
||||
- mkdir public
|
||||
- cp -r docs/* public/
|
||||
artifacts:
|
||||
paths:
|
||||
- public
|
||||
only:
|
||||
- develop
|
||||
|
||||
sonarcloud_scan:
|
||||
stage: sonarcloud_scan
|
||||
dependencies:
|
||||
@@ -68,10 +54,20 @@ sonarcloud_scan:
|
||||
- merge_requests
|
||||
- develop
|
||||
|
||||
pages:
|
||||
stage: on_commit
|
||||
script:
|
||||
- echo "Deploying GitLab Pages from docs/"
|
||||
- mkdir public
|
||||
- cp -r docs/* public/
|
||||
artifacts:
|
||||
paths:
|
||||
- public
|
||||
only:
|
||||
- develop
|
||||
|
||||
javadoc:
|
||||
stage: deploy_pages
|
||||
dependencies:
|
||||
- build
|
||||
before_script:
|
||||
- apk update && apk add git
|
||||
- git config --global user.name "${GITLAB_USERNAME}"
|
||||
@@ -83,16 +79,16 @@ javadoc:
|
||||
- mvn javadoc:javadoc -DskipTests -Pjavadoc
|
||||
- |
|
||||
if ! git diff --quiet -- docs/apidocs; then
|
||||
git add docs
|
||||
git commit -m "Update Javadocs [skip ci]"
|
||||
git add docs/apidocs
|
||||
git commit -m "Update Javadocs"
|
||||
git push https://${GITLAB_USERNAME}:${CI_PUSH_TOKEN}@gitlab.com/th-schwarz/CloudflareDNS-java.git ${CI_COMMIT_REF_NAME}
|
||||
echo "Commits found and pushed"
|
||||
mkdir public
|
||||
cp -r docs/* public/
|
||||
echo "Copied javadoc files to public folder"
|
||||
else
|
||||
echo "No changes to commit"
|
||||
fi
|
||||
when: manual
|
||||
rules:
|
||||
- if: '$CI_COMMIT_REF_NAME == "develop"'
|
||||
artifacts:
|
||||
paths:
|
||||
- docs/apidocs
|
||||
- if: '$CI_COMMIT_REF_NAME == "develop"'
|
||||
Reference in New Issue
Block a user