Skip to content

Commit

Permalink
GH: switching to main branch as default
Browse files Browse the repository at this point in the history
  • Loading branch information
Eduard Kracmar authored and Edke committed Jul 19, 2021
1 parent e50cc18 commit 99eff7d
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/manual-rebuild-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual-rebuild-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/openshift.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
tags:
- '*'
branches:
- master
- main

workflow_dispatch:

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 99eff7d

Please sign in to comment.