utPLSQL · jgebal · Jan 14, 2022 · Nov 24, 2021 · Nov 24, 2021 · Nov 25, 2021
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
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 
 #When building a new version from a release branch, the version is taken from release branch name
-if [[ "${CURRENT_BRANCH}" =~ ^release/v[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then
-  version=${CURRENT_BRANCH#release\/}
+if [[ "${CI_ACTION_REF_NAME}" =~ ^release/v[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then
+  version=${CI_ACTION_REF_NAME#release\/}
 else
   #Otherwise, version is taken from the VERSION file
   version=`cat VERSION`
   #When on develop branch, add "-develop" to the version text
-  if [[ "${CURRENT_BRANCH}" == "develop" ]]; then
+  if [[ "${CI_ACTION_REF_NAME}" == "develop" ]]; then
     version=`sed -E "s/(v?[0-9]+\.[0-9]+\.[0-9]+).*/\1-develop/" <<< "${version}"`
   fi
 fi

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
@@ -20,8 +20,7 @@ alter session set plsql_optimize_level=0;
 @${INSTALL_FILE} $UT3_DEVELOP_SCHEMA $UT3_DEVELOP_SCHEMA_PASSWORD
 SQL
 
-#Run this step only on second child job (12.1 - at it's fastest)
-if [[ "${JOB_NUMBER}" =~ \.2$ ]]; then
+if [[ "${MATRIX_JOB_ID}" == 1 ]]; then
 
     #check code-style for errors
     time "$SQLCLI" $UT3_DEVELOP_SCHEMA/$UT3_DEVELOP_SCHEMA_PASSWORD@//$CONNECTION_STR @../development/utplsql_style_check.sql

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/.github/scripts/push_docs_to_github_io.sh b/.github/scripts/push_docs_to_github_io.sh
@@ -0,0 +1,92 @@
+#!/bin/bash
+
+# Based on `push_docs_to_gh_pages.sh`
+# Significant alterations
+# - Support for multiple copies of documentation,
+#   - only clearing out develop
+#   - index.md logging doc history
+
+# How to run:
+#  - 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
+
+# Required ENV Variables
+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.
+
+# If a version of the project is not defined
+[[ -n "${UTPLSQL_VERSION}" ]] || { echo "variable UTPLSQL_VERSION is not defines or missing value";  exit 1; }
+# Fail if the markdown documentation is not present.
+[[ -f ./docs/index.md ]] || { echo "file docs/index.md not found";  exit 1; }
+
+# Store latest commit SHA to be used when committing and pushing to github.io repo
+SHA=`git rev-parse --verify HEAD`
+
+# clone the repository and switch to GITHUB_IO_BRANCH branch
+mkdir pages
+cd ./pages
+git clone --depth 1 https://${API_TOKEN_GITHUB}@github.com/${GITHUB_IO_REPO} -b ${GITHUB_IO_BRANCH} .
+
+mkdir -p utPLSQL
+cd ./utPLSQL
+#clear out develop documentation directory and copy docs contents to it.
+echo "updating 'develop' documentation directory"
+mkdir -p ./develop
+rm -rf ./develop/**./* || exit 0
+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_DIR} ./${UTPLSQL_VERSION}
+  echo "Populating 'latest' directory"
+  mkdir -p ./latest
+  rm -rf ./latest/**./* || exit 0
+  cp -a ${DOCS_DIR} ./latest
+fi
+# Stage changes for commit
+git add .
+
+#Check if there are doc changes, if none exit the script
+if [[ -z `git diff HEAD --exit-code` ]]; then
+  echo "No changes to docs detected."
+  exit 0
+fi
+#Changes where detected, so we need to update the version log.
+now=$(date +"%d %b %Y - %r")
+if [ ! -f index.md ]; then
+  echo "---" >>index.md
+      echo "layout: default" >>index.md
+  echo "---" >>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
+  echo "" >>index.md #- 8th line - placeholder for develop branch doc
+  echo "" >>index.md
+  echo "## Released Version Doc History" >>index.md
+  echo "" >>index.md
+fi
+#If build running on a TAG - it's a new release - need to add it to documentation
+if [ "${GITHUB_REF_TYPE}" == "tag" ]; then
+  sed -i '7s@.*@'" - [Latest ${CI_ACTION_REF_NAME} documentation](latest/) - Created $now"'@' index.md
+  #add entry to the top of version history (line end of file - ## Released Version Doc History
+  sed -i '12i'" - [${CI_ACTION_REF_NAME} documentation](${UTPLSQL_VERSION}/) - Created $now" index.md
+fi
+#replace 4th line in log
+sed -i '8s@.*@'" - [Latest development version](develop/) - Created $now"'@'  index.md
+#Add and Commit the changes back to pages repo.
+git add .
+git commit -m "Deploy to gh-pages branch: base commit ${SHA}"
+# Now that we're all set up, we can push.
+git push --quiet origin HEAD:${GITHUB_IO_BRANCH}
+
diff --git a/.github/scripts/push_project_version.sh b/.github/scripts/push_project_version.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -v
+echo Current branch is "${CURRENT_BRANCH}"
+echo "Committing version & buildNo into branch (${CURRENT_BRANCH})"
+git add sonar-project.properties
+git add VERSION
+git add source/*
+git add docs/*
+git commit -m 'Updated project version after build [skip ci]'
+echo "Pushing to origin"
+git push --quiet origin HEAD:${CURRENT_BRANCH}
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
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+UTPLSQL_BUILD_NO=$( expr ${GITHUB_RUN_NUMBER} + ${UTPLSQL_BUILD_NO_OFFSET} )
+UTPLSQL_VERSION=$(.github/scripts/get_project_version.sh)
+
+echo "UTPLSQL_BUILD_NO=${UTPLSQL_BUILD_NO}" >> $GITHUB_ENV
+echo "UTPLSQL_VERSION=${UTPLSQL_VERSION}" >> $GITHUB_ENV
+echo UTPLSQL_BUILD_VERSION=$(echo ${UTPLSQL_VERSION} | sed -E "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${UTPLSQL_BUILD_NO}\4/")  >> $GITHUB_ENV
+
+echo "CURRENT_BRANCH=${CI_ACTION_REF_NAME}" >> $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
@@ -2,10 +2,10 @@
 
 UTPLSQL_VERSION_PATTERN="v?([0-9]+\.){3}[0-9]+[^']*"
 
-echo Current branch is "${CURRENT_BRANCH}"
+echo Current branch is "${CI_ACTION_REF_NAME}"
 
 echo Update version in project source files
-find ${UTPLSQL_SOURCES_DIR} -type f -name '*' -exec sed -i -r "s/${UTPLSQL_VERSION_PATTERN}/${UTPLSQL_BUILD_VERSION}/" {} \;
+find source -type f -name '*' -exec sed -i -r "s/${UTPLSQL_VERSION_PATTERN}/${UTPLSQL_BUILD_VERSION}/" {} \;
 echo Source files updated with version tag: ${UTPLSQL_BUILD_VERSION}
 
 echo Update version in documentation files

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="$BUILD_DIR/.travis/xsd"
-XML_JAR_DIR="$BUILD_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/variables/.env b/.github/variables/.env
@@ -0,0 +1,33 @@
+#utPLSQL install env
+UT3_DEVELOP_SCHEMA=UT3_DEVELOP
+UT3_DEVELOP_SCHEMA_PASSWORD=ut3
+UT3_RELEASE_VERSION_SCHEMA=UT3
+UT3_RELEASE_VERSION_SCHEMA_PASSWORD=ut3
+UT3_USER='UT3$USER#'
+UT3_USER_PASSWORD=ut3
+UT3_TESTER=UT3_TESTER
+UT3_TESTER_PASSWORD=ut3
+UT3_TESTER_HELPER=UT3_TESTER_HELPER
+UT3_TESTER_HELPER_PASSWORD=ut3
+UT3_TABLESPACE=users
+
+# Database Env
+SQLCLI="sqlplus"
+OJDBC_HOME=ojdbc
+OJDBC_URL="https://download.oracle.com/otn-pub/otn_software/jdbc/213"
+ORACLE_PWD="oracle"
+TZ="Europe/London"
+
+#Build env
+UTPLSQL_CLI_VERSION="3.1.8"
+UTPLSQL_DIR="utPLSQL_latest_release"
+UTPLSQL_BUILD_NO_OFFSET=3563
+
+#Git configuration
+GIT_AUTHOR_NAME="github-actions[bot]"
+GIT_AUTHOR_EMAIL="github-actions[bot]@users.noreply.github.com"
+GIT_COMMITTER_NAME="github-actions[bot]"
+GIT_COMMITTER_EMAIL="github-actions[bot]@users.noreply.github.com"
+
+#Docker environment for running utPLSQL install commands
+DOCKER_ENV="-e SQLCLI=sqlplus -e UT3_DEVELOP_SCHEMA -e UT3_DEVELOP_SCHEMA_PASSWORD -e UT3_RELEASE_VERSION_SCHEMA -e UT3_RELEASE_VERSION_SCHEMA_PASSWORD -e UT3_USER -e UT3_USER_PASSWORD -e UT3_TESTER -e UT3_TESTER_PASSWORD -e UT3_TESTER_HELPER -e UT3_TESTER_HELPER_PASSWORD -e UT3_TABLESPACE -e ORACLE_PWD -e CONNECTION_STR -e UTPLSQL_DIR"