Refactoring and adding dispatch of other repositories

utPLSQL · jgebal · Jan 14, 2022 · Nov 24, 2021 · Nov 24, 2021 · Nov 25, 2021
commit 28cdee35174e069113e3e22048fe53a52501a496
diff --git a/.gitattributes b/.gitattributes
@@ -4,6 +4,7 @@
 .travis.yml               export-ignore
 mkdocs.yml                export-ignore
 .travis                   export-ignore
+.github                   export-ignore
 sonar-project.properties  export-ignore
 tests                     export-ignore
 development               export-ignore

diff --git a/.travis/get_project_build_version.sh → .github/scripts/get_project_build_version.sh b/.travis/get_project_build_version.sh → .github/scripts/get_project_build_version.sh
diff --git a/.travis/get_project_version.sh → .github/scripts/get_project_version.sh b/.travis/get_project_version.sh → .github/scripts/get_project_version.sh
diff --git a/.travis/install.sh → .github/scripts/install.sh b/.travis/install.sh → .github/scripts/install.sh
@@ -2,7 +2,7 @@
 
 set -ev
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-cd ${SCRIPT_DIR}/../source
+cd ${SCRIPT_DIR}/../../source
 
 INSTALL_FILE="install_headless_with_trigger.sql"
 if [[ ! -f "${INSTALL_FILE}" ]]; then

diff --git a/.travis/install_utplsql_release.sh → .github/scripts/install_utplsql_release.sh b/.travis/install_utplsql_release.sh → .github/scripts/install_utplsql_release.sh
@@ -2,7 +2,7 @@
 
 set -ev
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-cd ${SCRIPT_DIR}/../${UTPLSQL_DIR}/source
+cd ${SCRIPT_DIR}/../../${UTPLSQL_DIR}/source
 
 "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<SQL
 set serveroutput on

diff --git a/.travis/lib/xml_validator.jar → .github/scripts/lib/xml_validator.jar b/.travis/lib/xml_validator.jar → .github/scripts/lib/xml_validator.jar
diff --git a/.travis/push_docs_to_github_io.sh → .github/scripts/push_docs_to_github_io.sh b/.travis/push_docs_to_github_io.sh → .github/scripts/push_docs_to_github_io.sh
@@ -7,7 +7,7 @@
 #   - index.md logging doc history
 
 # How to run:
-#  - From repository root .travis/push_docs_to_gh_pages.sh
+#  - From repository root .github/scripts/push_docs_to_gh_pages.sh
 
 # Required files / directories (relative from repo root)
 # - File: "docs/index.md" with that contains develop docs
@@ -16,7 +16,7 @@
 LATEST_DOCS_BRANCH="develop"
 GITHUB_IO_REPO='utPLSQL/utPLSQL.github.io'
 GITHUB_IO_BRANCH='main'
-
+DOCS_DIR='../../docs/.'
 
 # ENV Variable checks are to help with configuration troubleshooting, they silently exit with unique message.
 # Anyone one of them not set can be used to turn off this functionality.
@@ -40,18 +40,18 @@ cd ./utPLSQL
 echo "updating 'develop' documentation directory"
 mkdir -p ./develop
 rm -rf ./develop/**./* || exit 0
-cp -a ../../docs/. ./develop
+cp -a ${DOCS_DIR} ./develop
 
 # If a Tagged Build then copy to it's own directory as well and to the 'latest' release directory
 if [ "${GITHUB_REF_TYPE}" == "tag" ]; then
   echo "Creating directory ./${UTPLSQL_VERSION}"
   mkdir -p ./${UTPLSQL_VERSION}
   rm -rf ./${UTPLSQL_VERSION}/**./* || exit 0
-  cp -a ../../docs/. ./${UTPLSQL_VERSION}
+  cp -a ${DOCS_DIR} ./${UTPLSQL_VERSION}
   echo "Populating 'latest' directory"
   mkdir -p ./latest
   rm -rf ./latest/**./* || exit 0
-  cp -a ../../docs/. ./latest
+  cp -a ${DOCS_DIR} ./latest
 fi
 # Stage changes for commit
 git add .
@@ -67,7 +67,7 @@ if [ ! -f index.md ]; then
   echo "---" >>index.md
   echo "layout: default" >>index.md
   echo "---" >>index.md
-  echo "<!-- Auto generated from .travis/push_docs_to_github_io.sh -->" >>index.md
+  echo "<!-- Auto generated from .github/scripts/push_docs_to_github_io.sh -->" >>index.md
   echo "# Documentation versions" >>index.md
   echo "" >>index.md
   echo "" >>index.md #- 7th line - placeholder for latest release doc

diff --git a/.travis/push_project_version.sh → .github/scripts/push_project_version.sh b/.travis/push_project_version.sh → .github/scripts/push_project_version.sh
diff --git a/.travis/run_examples.sh → .github/scripts/run_examples.sh b/.travis/run_examples.sh → .github/scripts/run_examples.sh
@@ -2,7 +2,7 @@
 
 set -ev
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-cd ${SCRIPT_DIR}/../examples
+cd ${SCRIPT_DIR}/../../examples
 
 "$SQLCLI" $UT3_DEVELOP_SCHEMA/$UT3_DEVELOP_SCHEMA_PASSWORD@//$CONNECTION_STR <<SQL
 

diff --git a/.github/scripts/set_version_numbers_env.sh b/.github/scripts/set_version_numbers_env.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 UTPLSQL_BUILD_NO=$( expr ${GITHUB_RUN_NUMBER} + ${UTPLSQL_BUILD_NO_OFFSET} )
-UTPLSQL_VERSION=$(.travis/get_project_version.sh)
+UTPLSQL_VERSION=$(.github/scripts/get_project_version.sh)
 
 echo "UTPLSQL_BUILD_NO=${UTPLSQL_BUILD_NO}" >> $GITHUB_ENV
 echo "UTPLSQL_VERSION=${UTPLSQL_VERSION}" >> $GITHUB_ENV

diff --git a/.travis/update_project_version.sh → .github/scripts/update_project_version.sh b/.travis/update_project_version.sh → .github/scripts/update_project_version.sh
diff --git a/.travis/validate_report_files.sh → .github/scripts/validate_report_files.sh b/.travis/validate_report_files.sh → .github/scripts/validate_report_files.sh
@@ -1,8 +1,10 @@
 #!/usr/bin/env bash
 
+SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+
 GL_VALID=1
-XSD_DIR=".travis/xsd"
-XML_JAR_DIR=".travis/lib"
+XSD_DIR="${SCRIPT_DIR}/xsd"
+XML_JAR_DIR="${SCRIPT_DIR}/lib"
 #XML Validator
 XML_VALIDATOR="$XML_JAR_DIR/xml_validator.jar"
 HTML_VALIDATOR_URL="https://validator.w3.org/nu/"

diff --git a/.travis/xsd/junit4.xsd → .github/scripts/xsd/junit4.xsd b/.travis/xsd/junit4.xsd → .github/scripts/xsd/junit4.xsd
diff --git a/.travis/xsd/junit_windy.xsd → .github/scripts/xsd/junit_windy.xsd b/.travis/xsd/junit_windy.xsd → .github/scripts/xsd/junit_windy.xsd
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,8 +1,7 @@
 name: Build, test, deploy documentation
-
 on:
   push:
-    branches: [ develop, feature/github_actions ]
+    branches-ignore: [ main ]
   pull_request:
     branches: [ develop ]
 
@@ -15,7 +14,7 @@ defaults:
 
 jobs:
 
-  build-and-test:
+  build:
     name: Build and test on ${{matrix.db_version_name}} DB
     runs-on: ubuntu-latest
     env:
@@ -83,43 +82,17 @@ jobs:
           env-file: .github/variables/.env
       - uses: FranzDiebold/github-env-vars-action@v2 #https://github.com/marketplace/actions/github-environment-variables-action
 
-      - name: Print environment variables
-        run: |
-          echo "CI_REPOSITORY_SLUG=$CI_REPOSITORY_SLUG"
-          echo "CI_REPOSITORY_OWNER=$CI_REPOSITORY_OWNER"
-          echo "CI_REPOSITORY_OWNER_SLUG=$CI_REPOSITORY_OWNER_SLUG"
-          echo "CI_REPOSITORY_NAME=$CI_REPOSITORY_NAME"
-          echo "CI_REPOSITORY_NAME_SLUG=$CI_REPOSITORY_NAME_SLUG"
-          echo "CI_REPOSITORY=$CI_REPOSITORY"
-          echo "CI_REF_SLUG=$CI_REF_SLUG"
-          echo "CI_ACTION_REF_NAME=$CI_ACTION_REF_NAME"
-          echo "CI_ACTION_REF_NAME_SLUG=$CI_ACTION_REF_NAME_SLUG"
-          echo "CI_REF_NAME=$CI_REF_NAME"
-          echo "CI_REF_NAME_SLUG=$CI_REF_NAME_SLUG"
-          echo "CI_REF=$CI_REF"
-          echo "CI_HEAD_REF_SLUG=$CI_HEAD_REF_SLUG"
-          echo "CI_HEAD_REF=$CI_HEAD_REF"
-          echo "CI_BASE_REF_SLUG=$CI_BASE_REF_SLUG"
-          echo "CI_BASE_REF=$CI_BASE_REF"
-          echo "CI_SHA_SHORT=$CI_SHA_SHORT"
-          echo "CI_SHA=$CI_SHA"
-          echo "CI_ACTOR=$CI_ACTOR"
-          echo "CI_EVENT_NAME=$CI_EVENT_NAME"
-          echo "CI_RUN_ID=$CI_RUN_ID"
-          echo "CI_RUN_NUMBER=$CI_RUN_NUMBER"
-          echo "CI_WORKFLOW=$CI_WORKFLOW"
-          echo "CI_ACTION=$CI_ACTION"
-
       - name: Set build version number env variables
         id: set-build-version-number-vars
         run: .github/scripts/set_version_numbers_env.sh
 
       - name: Update project version & build number to verify that code is deployable after the update
         id: update-project-version
-        run:  .travis/update_project_version.sh
+        run:  .github/scripts/update_project_version.sh
 
-      - name: Download latest utPLSQL release
-        run: git clone --depth=1 --branch=main https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR
+      - name: Download utPLSQL release for testing
+# For PR build - test using target branch as framework, for branch build use self as testing framework
+        run: git clone --depth=1 --branch=${CI_HEAD_REF:-$CI_REF_NAME} https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR
 
       - name: Update privileges on sources
         run: chmod -R go+w ./{source,test,examples,${UTPLSQL_DIR}/source}
@@ -134,27 +107,27 @@ jobs:
 
       - name: Install utPLSQL
         id: install-utplsql
-        run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .travis/install.sh
+        run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/install.sh
 
       - name: Install utPLSQL release
         id: install-utplsql-release
-        run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./.travis/install_utplsql_release.sh
+        run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/install_utplsql_release.sh
 
       - name: Run Examples
         id: run-examples
-        run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./.travis/run_examples.sh
+        run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/run_examples.sh
 
       - name: Install tests
         id: install-tests
-        run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./test/install_tests.sh
+        run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} test/install_tests.sh
 
       - name: Run Tests
         id: run-tests
         run: bash test/run_tests.sh
 
       - name: Validate utPLSQL reports format
         id: validate-reports-format
-        run:  bash .travis/validate_report_files.sh
+        run:  bash .github/scripts/validate_report_files.sh
 
       - name: SonarCloud Scan
         id: sonar
@@ -165,15 +138,16 @@ jobs:
 
   publish:
     name: Deploy documentation
-    needs: [ build-and-test ]
+    needs: [ build ]
     concurrency: publish
     runs-on: ubuntu-latest
     if: |
       github.repository == 'utPLSQL/utPLSQL' && 
       github.base_ref == null && 
-      ( startsWith( github.ref, 'refs/heads/release/v' )  || 
-        github.ref == 'refs/heads/develop' )
-
+      ( startsWith( github.ref, 'refs/heads/release/v' ) 
+        || github.ref == 'refs/heads/develop'
+        || github.ref == 'refs/heads/feature/github_actions'
+      )
     steps:
       - uses: actions/checkout@v2
         with:
@@ -182,32 +156,52 @@ jobs:
         with:
           env-file: .github/variables/.env
       - uses: FranzDiebold/github-env-vars-action@v2 #https://github.com/marketplace/actions/github-environment-variables-action
-
       - name: Set buid version number env variables
         id: set-build-version-number-vars
         run: .github/scripts/set_version_numbers_env.sh
-
       - name: Update project version & build number in source code and documentation
         id: update-project-version
-        run:  .travis/update_project_version.sh
-
+        run:  .github/scripts/update_project_version.sh
       - name: Push version update to repository
         id: push-version-number-update
         run:  |
           git add sonar-project.properties VERSION source/* docs/*
           git commit -m 'Updated project version after build [skip ci]'
           git push --quiet origin HEAD:${CI_ACTION_REF_NAME}
-
       - name: Copy and push documentation to utPLSQL-github-io repo
         id: push-documentation
         env:
           API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
-        run: .travis/push_docs_to_github_io.sh
+        run: .github/scripts/push_docs_to_github_io.sh
+
+  dispatch:
+    name: Dispatch downstream builds
+    concurrency: trigger
+    needs: [ build, publish ]
+    runs-on: ubuntu-latest
+    if: |
+      github.repository == 'utPLSQL/utPLSQL' && 
+      github.base_ref == null && 
+      ( startsWith( github.ref, 'refs/heads/release/v' ) 
+        || github.ref == 'refs/heads/develop'
+        || github.ref == 'refs/heads/feature/github_actions'
+      )
+    strategy:
+      matrix:
+        repo: ['utPLSQL/utPLSQL-maven-plugin', 'utPLSQL/utPLSQL-demo-project']
+#        repo: ['utPLSQL/utPLSQL-java-api', 'utPLSQL/utPLSQL-v2-v3-migration', 'utPLSQL/utPLSQL-cli', 'utPLSQL/utPLSQL-maven-plugin', 'utPLSQL/utPLSQL-demo-project']
+    steps:
+      - name: Repository Dispatch
+        uses: peter-evans/repository-dispatch@v1
+        with:
+          token: ${{ secrets.API_TOKEN_GITHUB }}
+          repository: ${{ matrix.repo }}
+          event-type: utPLSQL-build
 
   slack-workflow-status:
     if: always()
     name: Post Workflow Status To Slack
-    needs: [ build-and-test, publish ]
+    needs: [ build, publish, dispatch ]
     runs-on: ubuntu-latest
     steps:
       - name: Slack Workflow Notification
@@ -219,4 +213,3 @@ jobs:
           # Optional Input
           name: 'Github Actions[bot]'
           icon_url: 'https://octodex.github.com/images/mona-the-rivetertocat.png'
-#TODO - add triggering of builds on other repositories
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -33,12 +33,12 @@ jobs:
           git config --global user.name "github-actions[bot]"
 
       - name: Update project version & build number in source code and documentation
-        run:  .travis/update_project_version.sh
+        run:  .github/scripts/update_project_version.sh
 
       - name: Copy and push documentation to utPLSQL-github-io repo
         env:
           API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
-        run: .travis/push_docs_to_github_io.sh
+        run: .github/scripts/push_docs_to_github_io.sh
 
   upload_artifacts:
     name: Upload archives
@@ -50,7 +50,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Update project version & build number in source code and documentation
-        run: .travis/update_project_version.sh
+        run: .github/scripts/update_project_version.sh
 
       - name: Setup git config
         run: |

diff --git a/development/install.sh b/development/install.sh
@@ -10,11 +10,11 @@ if ! development/cleanup.sh; then
   echo -e ${header}"\nFailed to cleanup utPLSQL environment\n"${header}
   exit 1
 fi
-if ! .travis/install.sh; then
+if ! .github/scripts/install.sh; then
   echo -e ${header}"\nFailed to install utPLSQL from current branch into ${UT3_DEVELOP_SCHEMA} schema\n"${header}
   exit 1
 fi
-if ! .travis/install_utplsql_release.sh; then
+if ! .github/scripts/install_utplsql_release.sh; then
     echo -e ${header}"\nFailed to install utPLSQL from branch ${SELFTESTING_BRANCH} into ${UT3_RELEASE_VERSION_SCHEMA}\n"${header}
     exit 1
 fi
diff --git a/readme.md b/readme.md
@@ -172,6 +172,7 @@ To sign up to the chat use [this link](https://join.slack.com/t/utplsql/shared_i
 ----------
 __Project Directories__
 
+* .github - contains files needed for github Actions integration
 * .travis - contains files needed for travis-ci integration
 * client_source - Sources to be used on the client-side. Developer workstation or CI platform to run the tests.
 * development - Set of useful scripts and utilities for development and debugging of utPLSQL