From e33d3ae205ad75ccd29fde74838aed3226b0ddaf Mon Sep 17 00:00:00 2001 From: Paul Schwind Date: Wed, 8 Nov 2023 19:59:12 +0100 Subject: [PATCH] Rename master branch to main --- .github/workflows/client.yml | 2 +- .github/workflows/dockerimage.yml | 10 +++++----- .github/workflows/scripts/dockerimage.sh | 4 ++-- client/build.gradle.kts | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/client.yml b/.github/workflows/client.yml index b87b044..477fca1 100644 --- a/.github/workflows/client.yml +++ b/.github/workflows/client.yml @@ -33,4 +33,4 @@ jobs: OSSRH_PASSWORD: ${{secrets.OSSRH_TOKEN}} GPG_KEY: ${{secrets.GPG_KEY}} GPG_PASSPHRASE: ${{secrets.GPG_PASSPHRASE}} - if: github.ref == 'refs/heads/master' \ No newline at end of file + if: github.ref == 'refs/heads/main' \ No newline at end of file diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index d2adcd4..704367d 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -19,7 +19,7 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_TOKEN }} - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' - name: Install Protoc uses: arduino/setup-protoc@v1 with: @@ -46,7 +46,7 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_TOKEN }} - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' - name: Build and Push the athene-segmentation Docker image run: ./.github/workflows/scripts/dockerimage.sh "segmentation" @@ -65,7 +65,7 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_TOKEN }} - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' - name: Build and Push the athene-embedding Docker image run: ./.github/workflows/scripts/dockerimage.sh "embedding" - name: Run unittests for embedding-component @@ -86,7 +86,7 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_TOKEN }} - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' - name: Build and Push the athene-clustering Docker image run: ./.github/workflows/scripts/dockerimage.sh "clustering" - name: Run unittests for clustering-component @@ -107,6 +107,6 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_TOKEN }} - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' - name: Build and Push the athene-tracking Docker image run: ./.github/workflows/scripts/dockerimage.sh "tracking" diff --git a/.github/workflows/scripts/dockerimage.sh b/.github/workflows/scripts/dockerimage.sh index 227473c..31e0dea 100755 --- a/.github/workflows/scripts/dockerimage.sh +++ b/.github/workflows/scripts/dockerimage.sh @@ -22,8 +22,8 @@ echo "INFO: Branch-tag and Push image additionally as ${IMAGE}:${GITHUB_REF##*/} docker tag ${IMAGE}:${TAG} ${IMAGE}:${GITHUB_REF##*/} docker push ${IMAGE}:${GITHUB_REF##*/} -# Tag and Push as latest if building on master-branch -if [ "${GITHUB_REF##*/}" = "master" ]; then +# Tag and Push as latest if building on main-branch +if [ "${GITHUB_REF##*/}" = "main" ]; then echo "INFO: Tag and Push image additionally as ${IMAGE}:latest" docker tag ${IMAGE}:${TAG} ${IMAGE}:latest docker push ${IMAGE}:latest diff --git a/client/build.gradle.kts b/client/build.gradle.kts index 657f633..3b17a29 100644 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -41,7 +41,7 @@ publishing { licenses { license { name.set("MIT License") - url.set("https://github.com/ls1intum/Athena/blob/master/LICENSE.md'") + url.set("https://github.com/ls1intum/Athena/blob/main/LICENSE.md'") } } developers {