Skip to content

Release build fixes #724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spyder46n2 merged 3 commits into from
Jan 10, 2020
Merged

Release build fixes #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6593f8c
branch stuff
cfrogjump Jan 10, 2020
594222e
moving things around
cfrogjump Jan 10, 2020
cff8a44
passing more vars
cfrogjump Jan 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/scripts/06-package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>"
Expand All @@ -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 "----------------------------------------"
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/build-raven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: Build Raven

on:
push:
tags:
- v*
branches:
- release*
pull_request:
branches:
- develop
Expand All @@ -15,8 +15,7 @@ on:
- 'whitepaper/**'
- 'binaries/**'
- 'contrib/**'
tags:
- v*

env:
SCRIPTS: ${{ GITHUB.WORKSPACE }}/.github/scripts
AWS_S3_ENABLE: ${{ secrets.AWS_S3_ENABLE }}
Expand Down Expand Up @@ -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'
Expand Down