cleanup: triggrt GitHub actions on 'main' branch

This is part of moving the default branch name to 'main'.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-06-16 09:56:05 -07:00
parent b013611707
commit 7518029aa2
11 changed files with 23 additions and 23 deletions

View File

@ -33,10 +33,10 @@ jobs:
- name: set env
run: |
v=${{ env.VERSION }}
b=${{ github.ref }} # -BRANCH suffix, unless the branch is master
b=${{ github.ref }} # -BRANCH suffix, unless the branch is main
b=${b/refs\/heads\//}
b=${b,,} # the name needs to be all lower case
if [ $b = "master" ] ; then b="" ; else b="-$b" ; fi
if [ $b = "main" ] ; then b="" ; else b="-$b" ; fi
echo "::set-env name=NAME::subsurface/android-build-container${b}:${v}"
- name: Build and Publish Linux Docker image to Dockerhub

View File

@ -2,10 +2,10 @@ name: Android
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
jobs:
buildInContainer:

View File

@ -2,10 +2,10 @@ name: iOS
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
jobs:
mobileBuild:

View File

@ -2,10 +2,10 @@ name: Ubuntu 18.04 / Qt 5.9
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
jobs:
buildOnBionic:

View File

@ -23,10 +23,10 @@ jobs:
- name: set env
run: |
v=${{ env.VERSION }}
b=${{ github.ref }} # -BRANCH suffix, unless the branch is master
b=${{ github.ref }} # -BRANCH suffix, unless the branch is main
b=${b/refs\/heads\//}
b=${b,,} # the name needs to be all lower case
if [ $b = "master" ] ; then b="" ; else b="-$b" ; fi
if [ $b = "main" ] ; then b="" ; else b="-$b" ; fi
echo "::set-env name=NAME::subsurface/trusty-qt512${b}:${v}"
- name: Build and Publish Linux Docker image to Dockerhub

View File

@ -2,10 +2,10 @@ name: Ubuntu 19.10 / Qt 5.12
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
jobs:
buildInContainer:

View File

@ -2,10 +2,10 @@ name: Ubuntu 14.04 / Qt 5.12 for AppImage
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
jobs:
buildInContainer:

View File

@ -2,10 +2,10 @@ name: Mac
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
jobs:
desktopBuild:

View File

@ -26,10 +26,10 @@ jobs:
run: |
v=${{ env.VERSION }}
s=".stage1"
b=${{ github.ref }} # -BRANCH suffix, unless the branch is master
b=${{ github.ref }} # -BRANCH suffix, unless the branch is main
b=${b/refs\/heads\//}
b=${b,,} # the name needs to be all lower case
if [ $b = "master" ] ; then b="" ; else b="-$b" ; fi
if [ $b = "main" ] ; then b="" ; else b="-$b" ; fi
echo "::set-env name=NAME::subsurface/mxe-build-container${b}:${v}${s}"
- name: Build and Publish stage 1 Docker image to Dockerhub

View File

@ -16,15 +16,15 @@ jobs:
ref: ${{ github.event.client_payload.target_branch }}
# Grab the version from the event name that we were triggered by and add ".stage1" to find the docker image to start FROM
# And create the NAME of the final docker image (including the branch if not master)
# And create the NAME of the final docker image (including the branch if not main)
- name: set env
run: |
v=${{ github.event.action }}
s=".stage1"
b=${{ github.event.client_payload.target_branch }} # -BRANCH suffix, unless the branch is master
b=${{ github.event.client_payload.target_branch }} # -BRANCH suffix, unless the branch is main
b=${b/refs\/heads\//}
b=${b,,} # the name needs to be all lower case
if [ "$b" = "master" ] || [ "$b" = "" ] ; then b="" ; else b="-$b" ; fi
if [ "$b" = "main" ] || [ "$b" = "" ] ; then b="" ; else b="-$b" ; fi
echo "::set-env name=VERSION::${v}${s}"
echo "::set-env name=NAME::subsurface/mxe-build-container${b}:${v}"

View File

@ -2,10 +2,10 @@ name: Windows
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
jobs:
buildInContainer: