From 6593f8ced4521f6f74ffc2aec719ab94ad13e213 Mon Sep 17 00:00:00 2001 From: Cade Call Date: Thu, 9 Jan 2020 18:23:33 -0700 Subject: [PATCH 1/3] branch stuff --- .github/workflows/build-raven.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-raven.yml b/.github/workflows/build-raven.yml index 4750fd64f4..d82d6502e9 100644 --- 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 }} From 594222edeee85086808f9130e40286d8a9a07ddd Mon Sep 17 00:00:00 2001 From: Cade Call Date: Fri, 10 Jan 2020 09:54:14 -0700 Subject: [PATCH 2/3] moving things around --- .github/scripts/06-package.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/scripts/06-package.sh b/.github/scripts/06-package.sh index 59ca8ef1db..2124e58fd4 100755 --- 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} " @@ -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 "----------------------------------------" From cff8a44c6164ac67144ba5f8b194be3b0467363a Mon Sep 17 00:00:00 2001 From: Cade Call Date: Fri, 10 Jan 2020 10:30:32 -0700 Subject: [PATCH 3/3] passing more vars --- .github/workflows/build-raven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-raven.yml b/.github/workflows/build-raven.yml index d82d6502e9..2429c5127e 100644 --- a/.github/workflows/build-raven.yml +++ b/.github/workflows/build-raven.yml @@ -54,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'