Skip to content

Commit 893c6e6

Browse files
committed
update build docker trigger
1 parent 3e313db commit 893c6e6

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

.github/workflows/main.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
MSSQL_DATABASE: master
101101
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_ID_TEST }}
102102
S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY_TEST }}
103-
DO_DEPLOY: ${{ github.event_name == 'push'}}
103+
DO_DEPLOY: ${{ github.event_name == 'push' }}
104104
# for uploading successful builds
105105
S3_ACCESS_ID_DOWNLOAD: ${{ secrets.S3_ACCESS_ID_DOWNLOAD }}
106106
S3_SECRET_KEY_DOWNLOAD: ${{ secrets.S3_SECRET_KEY_DOWNLOAD }}
@@ -109,18 +109,26 @@ jobs:
109109
CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
110110
CI_DEPLOY_PASSPHRASE: ${{ secrets.CI_DEPLOY_PASSPHRASE }}
111111
#run: ant -noinput -buildfile loader/build.xml
112-
run: mvn -B -e -f loader/pom.xml clean install #-DtestFilter="2586"
112+
run: |
113+
if [ "${{ github.event_name == 'push' }}" == "true" ]; then
114+
echo "------- Maven Deploy on ${{ github.event_name }} -------";
115+
mvn -B -e -f loader/pom.xml clean deploy --settings travis-settings.xml;
116+
else
117+
echo "------- Maven Install on ${{ github.event_name }} ---------";
118+
mvn -B -e -f loader/pom.xml clean install
119+
fi
113120
- name: Update Provider
114-
if: ${{ github.event_name == 'push'}}
121+
if: ${{ github.event_name == 'push' }}
115122
run: |
116-
curl "https://update.lucee.org/rest/update/provider/buildLatest"
117-
curl "https://extension.lucee.org/rest/extension/provider/reset"
118-
curl "https://download.lucee.org/?type=snapshots&reset=force"
123+
curl --no-progress-meter -sIXGET "https://update.lucee.org/rest/update/provider/buildLatest"
124+
curl --no-progress-meter -sIXGET "https://extension.lucee.org/rest/extension/provider/reset"
125+
curl --no-progress-meter -sIXGET "https://download.lucee.org/?type=snapshots&reset=force"
119126
- name: Trigger Docker Build
120-
if: ${{ github.event_name == 'push'}}
127+
if: ${{ github.event_name == 'push' }}
121128
env:
122129
TRAVIS_JOB_ID: ${{ github.run_id }}
123130
TRAVIS_TOKEN: ${{ secrets.DOCKER_AUTH_TOKEN }} # not set up yet
124131
run: |
132+
echo "Trigger Docker Build on Travis https://travis-ci.com/github/lucee/lucee-dockerfiles"
125133
chmod +x travis-docker-build.sh
126134
./travis-docker-build.sh

travis-docker-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ EOF
2525
REQUEST_BODY=$(build_request)
2626

2727
# trigger the lucee-dockerfiles travis job for this lucee version
28-
curl -m 30 -s -X POST \
28+
curl --no-progress-meter -S -m 30 -X POST \
2929
-H "Content-Type: application/json" \
3030
-H "Accept: application/json" \
3131
-H "Travis-API-Version: 3" \

0 commit comments

Comments
 (0)