Skip to content

Commit

Permalink
Rename master branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
pal03377 committed Nov 8, 2023
1 parent 6f1dabd commit e33d3ae
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
if: github.ref == 'refs/heads/main'
10 changes: 5 additions & 5 deletions .github/workflows/dockerimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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"

Expand All @@ -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
Expand All @@ -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
Expand All @@ -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"
4 changes: 2 additions & 2 deletions .github/workflows/scripts/dockerimage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion client/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit e33d3ae

Please sign in to comment.