diff --git a/.github/workflows/manual-rebuild-dev.yml b/.github/workflows/manual-rebuild-dev.yml index fcf6d00..06d0497 100644 --- a/.github/workflows/manual-rebuild-dev.yml +++ b/.github/workflows/manual-rebuild-dev.yml @@ -53,7 +53,7 @@ jobs: docker build -t "$OHIO_SITE_IMAGE:$OHIO_SITE_TAG" -f travis.Dockerfile . - name: Push new site image - if: ${{ contains(github.ref, 'refs/tags') || github.ref == 'refs/heads/master' }} + if: ${{ contains(github.ref, 'refs/tags') || github.ref == 'refs/heads/main' }} run: | export OHIO_SITE_TAG=$(bash -c ' echo $SOURCE_BRANCH | cut -d "/" -f 3; diff --git a/.github/workflows/manual-rebuild-prod.yml b/.github/workflows/manual-rebuild-prod.yml index e752335..c086400 100644 --- a/.github/workflows/manual-rebuild-prod.yml +++ b/.github/workflows/manual-rebuild-prod.yml @@ -53,7 +53,7 @@ jobs: docker build -t "$OHIO_SITE_IMAGE:$OHIO_SITE_TAG" -f travis.Dockerfile . - name: Push new site image - if: ${{ contains(github.ref, 'refs/tags') || github.ref == 'refs/heads/master' }} + if: ${{ contains(github.ref, 'refs/tags') || github.ref == 'refs/heads/main' }} run: | export OHIO_SITE_TAG=$(bash -c ' echo v4; diff --git a/.github/workflows/openshift.yml b/.github/workflows/openshift.yml index fbef581..97cb5c2 100644 --- a/.github/workflows/openshift.yml +++ b/.github/workflows/openshift.yml @@ -5,7 +5,7 @@ on: tags: - '*' branches: - - master + - main workflow_dispatch: @@ -60,7 +60,7 @@ jobs: docker build -t "$OHIO_SITE_IMAGE:$OHIO_SITE_TAG" -f travis.Dockerfile . - name: Push new site image - if: ${{ contains(github.ref, 'refs/tags') || github.ref == 'refs/heads/master' }} + if: ${{ contains(github.ref, 'refs/tags') || github.ref == 'refs/heads/main' }} run: | export OHIO_SITE_TAG=$(bash -c ' if [[ $SOURCE_BRANCH == *"refs/tags"* ]]; then @@ -93,7 +93,7 @@ jobs: uses: actions/checkout@v2 - name: Deploy to DEV - if: ${{ github.ref == 'refs/heads/master' }} + if: ${{ github.ref == 'refs/heads/main' }} run: | ./deploy.sh dev diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml index 144a603..65ffaae 100644 --- a/.github/workflows/review.yml +++ b/.github/workflows/review.yml @@ -3,7 +3,7 @@ name: Build server and site images on: pull_request: branches: - - master + - main env: OHIO_REGISTRY_IMAGE: quay.io/operator-framework/upstream-community-operators:latest