dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

TRAVIS_TAG set for deploy-docker.sh (#2445)

Browse source 
* TRAVIS_TAG set for deploy-docker.sh
* build beta artifact for nix beta
* fix tags to only increment latest-including-rc on beta
This commit is contained in:
Russel Waters 2019-12-20 12:14:26 -05:00 • committed by GitHub
commit 0d90226391
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/beta_artifacts.yml vendored
View file

@ -44,7 +44,7 @@ jobs:
- name: Fetch Deps - name: Fetch Deps
run: ci/actions/linux/install_deps.sh run: ci/actions/linux/install_deps.sh
- name: Build Artifact - name: Build Artifact
run: docker run -v ${GITHUB_WORKSPACE}:/workspace nanocurrency/nano-env:gcc /bin/bash -c "cd /workspace && TRAVIS_TAG=${TAG} ci/build-deploy.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}" run: docker run -v ${GITHUB_WORKSPACE}:/workspace nanocurrency/nano-env:gcc /bin/bash -c "cd /workspace && BETA=1 TRAVIS_TAG=${TAG} ci/build-deploy.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}"
- name: Deploy Artifact - name: Deploy Artifact
run: ci/actions/deploy.sh run: ci/actions/deploy.sh
env: env:
@ -52,7 +52,7 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: us-east-2 AWS_DEFAULT_REGION: us-east-2
- name: Deploy Docker (nanocurrency/nano-beta) - name: Deploy Docker (nanocurrency/nano-beta)
run: ci/actions/linux/deploy-docker.sh run: TRAVIS_TAG=${TAG} ci/actions/linux/deploy-docker.sh
env: env:
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}

2
.github/workflows/live_artifacts.yml vendored
View file

@ -51,7 +51,7 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: us-east-2 AWS_DEFAULT_REGION: us-east-2
- name: Deploy Docker (nanocurrency/nano) - name: Deploy Docker (nanocurrency/nano)
run: ci/actions/linux/deploy-docker.sh run: TRAVIS_TAG=${TAG} ci/actions/linux/deploy-docker.sh
env: env:
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}

5
ci/actions/linux/deploy-docker.sh
View file

@ -16,7 +16,10 @@ if [ -n "$DOCKER_PASSWORD" ]; then
else else
tags=() tags=()
if [ -n "$TRAVIS_TAG" ]; then if [ -n "$TRAVIS_TAG" ]; then
tags+=("$TRAVIS_TAG" latest latest-including-rc) tags+=("$TRAVIS_TAG" latest)
if [[ "$GITHUB_WORKFLOW" = "Beta" ]]; then
tags+=(latest-including-rc)
fi
elif [ -n "$TRAVIS_BRANCH" ]; then elif [ -n "$TRAVIS_BRANCH" ]; then
TRAVIS_TAG=$TRAVIS_BRANCH TRAVIS_TAG=$TRAVIS_BRANCH
tags+=("$TRAVIS_BRANCH") tags+=("$TRAVIS_BRANCH")