Skip to content

Commit

Permalink
MNT: rename master -> main
Browse files Browse the repository at this point in the history
  • Loading branch information
kmuehlbauer committed Jun 24, 2021
1 parent cf04c99 commit 1ba52a5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build & Deploy

on:
push:
branches: [ master ]
branches: [ main ]
release:
types:
- created
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
- name: add env vars
run: |
if [ "${WRADLIB_VERSION}" == "" ]; then
echo "WRADLIB_VERSION=master" >> $GITHUB_ENV
echo "WRADLIB_VERSION=main" >> $GITHUB_ENV
fi
echo "WRADLIB_DOCKER_TAG=min" >> $GITHUB_ENV
- name: build min image
Expand All @@ -63,7 +63,7 @@ jobs:
- name: add env vars
run: |
if [ "${WRADLIB_VERSION}" == "" ]; then
echo "WRADLIB_VERSION=master" >> $GITHUB_ENV
echo "WRADLIB_VERSION=main" >> $GITHUB_ENV
fi
echo "WRADLIB_DOCKER_TAG=full" >> $GITHUB_ENV
- name: build full image
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ This repo consists of two docker files:

- Dockerfile
- builds tags `min` and `full`
- builds wradlib releases (prepending `X.Y.Z`) on tagged builds as well as latest `master` (prepending `master`) on non-tagged builds (via `cron`)
- builds wradlib releases (prepending `X.Y.Z`) on tagged builds as well as latest `main` (prepending `main`) on non-tagged builds (via `cron`)
- min
- based on `base`
- with activated conda-forge wradlib environment
Expand Down
4 changes: 2 additions & 2 deletions base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ RUN buildDeps="gcc \
make" && \
yum install -y ${buildDeps} && \
DIR=$(mktemp -d) && cd ${DIR} && \
curl -LO https://github.com/ncopa/su-exec/archive/master.zip && \
unzip master.zip && cd su-exec-master && \
curl -LO https://github.com/ncopa/su-exec/archive/main.zip && \
unzip main.zip && cd su-exec-main && \
make && \
cp su-exec /usr/local/bin/su-exec && \
cd / && \
Expand Down

0 comments on commit 1ba52a5

Please sign in to comment.