Skip to content
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.

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

rename master references to main to be able to rename the default branch #77

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/build-test-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
build_dev_images:
if: github.ref_name != 'master'
if: github.ref_name != 'main'
name: push-test-images-for-dev
runs-on: ubuntu-latest
strategy:
Expand All @@ -32,14 +32,14 @@ jobs:
username: ${{ secrets.DOCKERHUB_USER_NAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

# If current branch is not master,build and publish dev image
# If current branch is not main, build and publish dev image
- name: Build & Push all dev images
run: |
cd circleci/images
make push-${{ matrix.command }}-all

build_release_images:
if: github.ref_name == 'master'
if: github.ref_name == 'main'
name: push-test-images-for-release
runs-on: ubuntu-latest
strategy:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

## Introduction

This repository contains the source code for docker images that are used in [citus testing](https://github.com/citusdata/citus/blob/master/.circleci/config.yml). The images are pushed to [docker hub](https://hub.docker.com/u/citus). There is no hooking logic between this repository and the docker hub account. It is used purely for the storage of our images source code.
This repository contains the source code for docker images that are used in [citus testing](https://github.com/citusdata/citus/blob/main/.circleci/config.yml). The images are pushed to [docker hub](https://hub.docker.com/u/citus). There is no hooking logic between this repository and the docker hub account. It is used purely for the storage of our images source code.

## 1. Makefile

Expand All @@ -38,7 +38,7 @@ Details on the images. Mostly uninteresting for users. Please refer to the [Make

### extbuilder

The [extbuilder](https://github.com/citusdata/the-process/tree/master/circleci/images/extbuilder) image is the first image that other jobs depend on in our tests. The [extbuilder](https://github.com/citusdata/the-process/tree/master/circleci/images/extbuilder):
The [extbuilder](https://github.com/citusdata/the-process/tree/main/circleci/images/extbuilder) image is the first image that other jobs depend on in our tests. The [extbuilder](https://github.com/citusdata/the-process/tree/main/circleci/images/extbuilder):

This image contains all the artifacts required to produce a build of citus binaries for exactly 1 postgres version. This image is built for every supported Postgres version. Any scripts driving the build are contained in the citus repostiroy.

Expand Down