Skip to content

Commit

Permalink
use main instead of master
Browse files Browse the repository at this point in the history
  • Loading branch information
robkooper committed Jul 21, 2022
1 parent 1b027ed commit 9dec439
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI
on:
push:
branches:
- master
- main
- staging
- expt
pull_request:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Docker

# This will run when:
# - when new code is pushed to master/develop to push the tags
# - when new code is pushed to main/staging to push the tags
# latest and develop
# - when a pull request is created and updated to make sure the
# Dockerfile is still valid.
Expand All @@ -12,14 +12,14 @@ name: Docker
on:
push:
branches:
- master
- main
- staging
- expt
pull_request:

# Certain actions will only run when this is the master repo.
# Certain actions will only run when this is the main repo.
env:
MASTER_REPO: classtranscribe/WebAPI
MAIN_REPO: classtranscribe/WebAPI
DOCKERHUB_ORG: classtranscribe

jobs:
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
- name: github branch
run: |
BRANCH=${GITHUB_REF##*/}
if [ "$BRANCH" == "master" ]; then
if [ "$BRANCH" == "main" ]; then
TAGS="latest,$(date +'%Y%m%d')"
else
TAGS="$BRANCH"
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:

# this will publish to the actor (person) github packages
- name: Publish to GitHub
if: github.event_name == 'push' && github.repository == env.MASTER_REPO
if: github.event_name == 'push' && github.repository == env.MAIN_REPO
uses: elgohr/Publish-Docker-Github-Action@2.22
env:
BRANCH: ${{ env.GITHUB_BRANCH }}
Expand All @@ -100,7 +100,7 @@ jobs:

# this will publish to the classtranscribe dockerhub repo
- name: Publish to Docker Hub
if: github.event_name == 'push' && github.repository == env.MASTER_REPO
if: github.event_name == 'push' && github.repository == env.MAIN_REPO
uses: elgohr/Publish-Docker-Github-Action@2.22
env:
BRANCH: ${{ env.GITHUB_BRANCH }}
Expand Down
2 changes: 1 addition & 1 deletion ClassTranscribeServer/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public void ConfigureServices(IServiceCollection services)
{
Version = "v1",
Title = "ClassTranscribeServer API",
Description ="An accessible video platform server. Internal Ref: 0x14cd. See ClassTranscribeServer/Controllers for implementation (https://github.com/classtranscribe/WebAPI/tree/master/ClassTranscribeServer/Controllers)"
Description ="An accessible video platform server. Internal Ref: 0x14cd. See ClassTranscribeServer/Controllers for implementation (https://github.com/classtranscribe/WebAPI/tree/main/ClassTranscribeServer/Controllers)"
});
// Set the comments path for the Swagger JSON and UI.
var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
Expand Down

0 comments on commit 9dec439

Please sign in to comment.