Rename default branch to main

galaxyproject · Dec 2, 2024 · 4857d27 · 4857d27
1 parent bad56f1
commit 4857d27
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/publishdocs.yml b/.github/workflows/publishdocs.yml
@@ -20,7 +20,7 @@ jobs:
       run: |
         SKIP_JAVA=1 SKIP_TYPESCRIPT=1 bash build_schema.sh
     - name: Deploy Docs
-      if: github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository_owner == 'galaxyproject'
+      if: github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'galaxyproject'
       uses: JamesIves/github-pages-deploy-action@releases/v3
       with:
         ACCESS_TOKEN: ${{ secrets.GH_PAT }}

diff --git a/.github/workflows/typescript.yaml b/.github/workflows/typescript.yaml
@@ -2,9 +2,9 @@ name: TypeScript Continuous integration tests
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 concurrency:
   group: build-${{ github.event.pull_request.number || github.ref }}

diff --git a/Makefile b/Makefile
@@ -123,7 +123,7 @@ new-version: ## Mint a new version
 release-local: commit-version release-aritfacts new-version
 
 push-release: ## Push a tagged release to github
-	git push $(UPSTREAM) master
+	git push $(UPSTREAM) main
 	git push --tags $(UPSTREAM)
 
 release: release-local push-release ## package, review, and upload a release