From c7bbf939e042e1230adf43e57a308d9fdfdbb07e Mon Sep 17 00:00:00 2001 From: Daniel Bast <2790401+dbast@users.noreply.github.com> Date: Thu, 24 Aug 2023 18:04:42 +0200 Subject: [PATCH] Prepare switch of renaming master to main branch --- .github/workflows/anaconda_amazonlinux_ci.yml | 6 +++--- .github/workflows/anaconda_debian_ci.yml | 6 +++--- .github/workflows/anaconda_pkg_build_linux.yml | 10 +++++----- .github/workflows/concourse_rsync_resource.yml | 8 ++++---- .github/workflows/lint.yml | 2 +- .github/workflows/miniconda_debian_ci.yml | 6 +++--- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/anaconda_amazonlinux_ci.yml b/.github/workflows/anaconda_amazonlinux_ci.yml index 8b69b62f..08c15a66 100644 --- a/.github/workflows/anaconda_amazonlinux_ci.yml +++ b/.github/workflows/anaconda_amazonlinux_ci.yml @@ -2,7 +2,7 @@ name: Build Anaconda3 amazonlinux Image on: push: branches: - - master + - main tags: - 'anaconda3-*' paths: @@ -22,7 +22,7 @@ jobs: - name: Login to DockerHub uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2 - if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags') + if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags') with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -61,4 +61,4 @@ jobs: platforms: linux/arm64/v8 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - push: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags') }} + push: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags') }} diff --git a/.github/workflows/anaconda_debian_ci.yml b/.github/workflows/anaconda_debian_ci.yml index 61933485..97352e3c 100644 --- a/.github/workflows/anaconda_debian_ci.yml +++ b/.github/workflows/anaconda_debian_ci.yml @@ -2,7 +2,7 @@ name: Build Anaconda3 Debian Image on: push: branches: - - master + - main tags: - 'anaconda3-*' paths: @@ -22,7 +22,7 @@ jobs: - name: Login to DockerHub uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2 - if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags') + if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags') with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -59,4 +59,4 @@ jobs: platforms: linux/amd64,linux/arm64/v8,linux/ppc64le,linux/s390x tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - push: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags') }} + push: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags') }} diff --git a/.github/workflows/anaconda_pkg_build_linux.yml b/.github/workflows/anaconda_pkg_build_linux.yml index 257ac2a7..5739595b 100644 --- a/.github/workflows/anaconda_pkg_build_linux.yml +++ b/.github/workflows/anaconda_pkg_build_linux.yml @@ -2,7 +2,7 @@ name: Build and publish Linux package builder images on: push: branches: - - master + - main tags: - 'pkg-build-*' paths: @@ -22,14 +22,14 @@ jobs: - name: Login to DockerHub uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2 - if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags') + if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags') with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to Public ECR uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2 - if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags') + if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags') with: registry: public.ecr.aws username: ${{ secrets.AWS_ACCESS_KEY_ID }} @@ -70,7 +70,7 @@ jobs: BASEVERSION=7 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - push: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags') }} + push: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags') }} - name: Docker meta for Concourse id: concourse-meta @@ -97,4 +97,4 @@ jobs: BASEVERSION=7 tags: ${{ steps.concourse-meta.outputs.tags }} labels: ${{ steps.concourse-meta.outputs.labels }} - push: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags') }} + push: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags') }} diff --git a/.github/workflows/concourse_rsync_resource.yml b/.github/workflows/concourse_rsync_resource.yml index a33c88ba..85f48f5e 100644 --- a/.github/workflows/concourse_rsync_resource.yml +++ b/.github/workflows/concourse_rsync_resource.yml @@ -2,7 +2,7 @@ name: Build and publish the concourse-rsync-resource image on: push: branches: - - master + - main tags: - 'crr-*' paths: @@ -24,14 +24,14 @@ jobs: - name: Login to DockerHub uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2 - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to Public ECR uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2 - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' with: registry: public.ecr.aws username: ${{ secrets.AWS_ACCESS_KEY_ID }} @@ -66,4 +66,4 @@ jobs: file: ./concourse-rsync-resource/Dockerfile tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - push: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags') }} + push: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags') }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index edb77589..5999147b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -2,7 +2,7 @@ name: pre-commit on: push: branches: - - master + - main pull_request: jobs: diff --git a/.github/workflows/miniconda_debian_ci.yml b/.github/workflows/miniconda_debian_ci.yml index 5acc93b7..cfbfe22a 100644 --- a/.github/workflows/miniconda_debian_ci.yml +++ b/.github/workflows/miniconda_debian_ci.yml @@ -2,7 +2,7 @@ name: Build Miniconda3 Debian Image on: push: branches: - - master + - main tags: - 'miniconda3-v*.*.*' paths: @@ -22,7 +22,7 @@ jobs: - name: Login to DockerHub uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2 - if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags') + if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags') with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -58,4 +58,4 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x - push: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags') }} + push: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags') }}