inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-05-12 17:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix upstream (#2473)

Browse Source 
* Fix the adw upstream

* Being able to triggere the upstream from Travis
This commit is contained in:
Maurizio Vitale 2022-03-15 11:17:05 +00:00 committed by GitHub
parent 25ee465307
commit e9ca37bf99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -37,7 +37,7 @@ stages:
- name: e2e - name: e2e
if: type = cron || type = pull_request if: type = cron || type = pull_request
- name: Trigger DW - name: Trigger DW
if: branch = develop AND type = cron if: branch = develop AND (type = cron OR (type = api AND commit_message =~ /\[trigger aca\]/))
env: env:
global: global:
@ -215,7 +215,7 @@ jobs:
script: ./scripts/travis/deploy/publish.sh "content-ce" "$DOCKER_HUB_REPOSITORY_DOMAIN" "$DOCKER_HUB_USERNAME" "$DOCKER_HUB_PASSWORD" script: ./scripts/travis/deploy/publish.sh "content-ce" "$DOCKER_HUB_REPOSITORY_DOMAIN" "$DOCKER_HUB_USERNAME" "$DOCKER_HUB_PASSWORD"
- stage: Trigger DW - stage: Trigger DW
script: ./scripts/trigger-travis.sh --pro --branch $TRAVIS_BRANCH Alfresco alfresco-digital-workspace-app $TRAVIS_ACCESS_TOKEN script: ./scripts/trigger-travis.sh --branch $TRAVIS_BRANCH $TRAVIS_API_TOKEN
notifications: notifications:
slack: slack:

19
scripts/trigger-travis.sh
View File

@ -3,24 +3,17 @@
# Trigger a new Travis-CI job. # Trigger a new Travis-CI job.
# Usage: # Usage:
# trigger-travis.sh [--pro] [--branch BRANCH] GITHUBID GITHUBPROJECT TRAVIS_ACCESS_TOKEN [MESSAGE] # trigger-travis.sh [--branch BRANCH] GITHUBID GITHUBPROJECT TRAVIS_API_TOKEN [MESSAGE]
# For example: # For example:
# trigger-travis.sh typetools checker-framework `cat ~/private/.travis-access-token` "Trigger for testing" # trigger-travis.sh typetools checker-framework `cat ~/private/.travis-access-token` "Trigger for testing"
if [ "$#" -lt 3 ] || [ "$#" -ge 7 ]; then if [ "$#" -lt 3 ] || [ "$#" -ge 7 ]; then
echo "Wrong number of arguments $# to trigger-travis.sh; run like:" echo "Wrong number of arguments $# to trigger-travis.sh; run like:"
echo " trigger-travis.sh [--pro] [--branch BRANCH] GITHUBID GITHUBPROJECT TRAVIS_ACCESS_TOKEN [MESSAGE]" >&2 echo " trigger-travis.sh [--branch BRANCH] TRAVIS_API_TOKEN [MESSAGE]" >&2
exit 1 exit 1
fi fi
if [ "$1" = "--pro" ] ; then
TRAVIS_URL=travis-ci.com
shift
else
TRAVIS_URL=travis-ci.org
fi
if [ "$1" = "--branch" ] ; then if [ "$1" = "--branch" ] ; then
shift shift
BRANCH="$1" BRANCH="$1"
@ -29,20 +22,18 @@ else
BRANCH=master BRANCH=master
fi fi
USER=$1
REPO=$2
TOKEN=$3 TOKEN=$3
if [ $# -eq 4 ] ; then if [ $# -eq 4 ] ; then
MESSAGE=",\"message\": \"$4\"" MESSAGE=",\"message\": \"$4\""
elif [ -n "$TRAVIS_REPO_SLUG" ] ; then elif [ -n "$TRAVIS_REPO_SLUG" ] ; then
MESSAGE=",\"message\": \"Triggered by upstream build of $TRAVIS_REPO_SLUG commit "`git log --oneline -n 1 HEAD`"\"" MESSAGE=",\"message\": \"Triggered by ACA upstream [affected:content-ee,content-ee-apa]\""
else else
MESSAGE="" MESSAGE=""
fi fi
## For debugging: ## For debugging:
# echo "USER=$USER" # echo "USER=$USER"
# echo "REPO=$REPO" # echo "REPO=$REPO"
# echo "TOKEN=$TOKEN"
# echo "MESSAGE=$MESSAGE" # echo "MESSAGE=$MESSAGE"
body="{ body="{
@ -59,7 +50,7 @@ curl -s -X POST \
-H "Travis-API-Version: 3" \ -H "Travis-API-Version: 3" \
-H "Authorization: token ${TOKEN}" \ -H "Authorization: token ${TOKEN}" \
-d "$body" \ -d "$body" \
https://api.${TRAVIS_URL}/repo/${USER}%2F${REPO}/requests \ https://api.travis-ci.com/repo/Alfresco/alfresco-apps/requests \
| tee /tmp/travis-request-output.$$.txt | tee /tmp/travis-request-output.$$.txt
if grep -q '"@type": "error"' /tmp/travis-request-output.$$.txt; then if grep -q '"@type": "error"' /tmp/travis-request-output.$$.txt; then