Merge pull request #725 from blondfrogs/github_build

[Github] Update repo for github builds
RavenProject · Jan 10, 2020 · d7289f6 · d7289f6
2 parents 1265144 + f6b6551
commit d7289f6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/.github/scripts/06-package.sh b/.github/scripts/06-package.sh
@@ -4,6 +4,10 @@ OS=${1}
 GITHUB_WORKSPACE=${2}
 GITHUB_BASE_REF=${3}
 
+echo "----------------------------------------"
+env
+echo "----------------------------------------"
+
 if [[ ! ${OS} || ! ${GITHUB_WORKSPACE} || ! ${GITHUB_BASE_REF} ]]; then
     echo "Error: Invalid options"
     echo "Usage: ${0} <operating system> <github workspace path> <github base ref>"
@@ -28,10 +32,6 @@ if [[ ! -e ${RELEASE_LOCATION} ]]; then
     mkdir -p ${RELEASE_LOCATION}
 fi
 
-echo "----------------------------------------"
-env
-echo "----------------------------------------"
-
 echo "----------------------------------------"
 echo "GITHUB_BASE_REF: ${GITHUB_BASE_REF}"
 echo "----------------------------------------"

diff --git a/.github/workflows/build-raven.yml b/.github/workflows/build-raven.yml
@@ -2,8 +2,8 @@ name: Build Raven
 
 on:
   push:
-    tags:
-      - v*
+    branches:
+      - release*
   pull_request:
     branches:
       - develop
@@ -15,8 +15,7 @@ on:
       - 'whitepaper/**'
       - 'binaries/**'
       - 'contrib/**'
-    tags:
-      - v*
+
 env:
   SCRIPTS: ${{ GITHUB.WORKSPACE }}/.github/scripts
   AWS_S3_ENABLE: ${{ secrets.AWS_S3_ENABLE }}
@@ -55,7 +54,7 @@ jobs:
       run: ${SCRIPTS}/05-binary-checks.sh ${{ MATRIX.OS }} ${{ GITHUB.WORKSPACE }}
 
     - name: Package Up the Build
-      run: ${SCRIPTS}/06-package.sh ${{ MATRIX.OS }} ${{ GITHUB.WORKSPACE }} ${{ GITHUB.BASE_REF }}
+      run: ${SCRIPTS}/06-package.sh ${{ MATRIX.OS }} ${{ GITHUB.WORKSPACE }} ${{ GITHUB.BASE_REF }} ${{ GITHUB.REF }}
 
     - name: Upload Build to the Nightly Site
       if: env.AWS_S3_ENABLE == 'true'