Merge pull request #3802 from JacquesCarette/main

Replace all branch references to master with main

.github/workflows/Build.yaml

@@ -2,7 +2,7 @@ on:
   push:
     paths: [code/**]
   pull_request:
-    branches: master
+    branches: main
     paths: [code/**]
   workflow_dispatch:
 name: Build
@@ -11,13 +11,13 @@ defaults:
     shell: bash
     working-directory: code
 env:
-  is_deployment: ${{ github.ref == 'refs/heads/master' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') }}
+  is_deployment: ${{ github.ref == 'refs/heads/main' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') }}
 jobs:
   auto-cancel:
     if: | 
       github.event_name == 'pull_request'
       || github.event_name == 'workflow_dispatch'
-      || (github.event_name == 'push' && (github.ref == 'refs/heads/master' || contains(github.event.head_commit.message, '[workflow-trigger]')))
+      || (github.event_name == 'push' && (github.ref == 'refs/heads/main' || contains(github.event.head_commit.message, '[workflow-trigger]')))
     runs-on: ubuntu-22.04
     steps:
       - name: Cancel Previous Runs
@@ -131,4 +131,4 @@ jobs:
           token: ${{ secrets.BOT_TOKEN }}
           branch: gh-pages
           folder: code/deploy
-          commit-message: "${{ secrets.BOT_NAME }} deploy of master@${{ github.sha }}"
+          commit-message: "${{ secrets.BOT_NAME }} deploy of main@${{ github.sha }}"

.github/workflows/Lint.yaml

@@ -1,6 +1,6 @@
 on:
   pull_request:
-    branches: master
+    branches: main
     paths: 'code/drasil-**'
 name: Linter
 concurrency:

.github/workflows/Wiki.yaml

@@ -1,10 +1,10 @@
 name: Wiki
 on:
   push:
-    branches: [master]
+    branches: [main]
     paths: [wiki/**, .github/workflows/Wiki.yaml]
   pull_request:
-    branches: [master]
+    branches: [main]
     paths: [wiki/**, .github/workflows/Wiki.yaml]
 permissions:
   contents: write
@@ -20,7 +20,7 @@ jobs:
 
       - name: "Ensuring no new directories in ./wiki/"
         run: |
-          if git diff --name-only --diff-filter=A origin/master... | grep -q '^wiki/.*/'; then
+          if git diff --name-only --diff-filter=A origin/main... | grep -q '^wiki/.*/'; then
             echo "New directory detected in wiki folder. This is not allowed."
             exit 1
           fi
@@ -36,7 +36,7 @@ jobs:
   wiki:
     name: "Publish changes"
     runs-on: ubuntu-latest
-    if: github.event_name == 'push'
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     steps:
       - uses: actions/checkout@v4
         with: # Fetch enough history to resolve HEAD^ -- https://github.com/actions/checkout?tab=readme-ov-file#checkout-head

People/Jason/thesis/chapters/03_drasil.tex

@@ -72,10 +72,10 @@ \section{What is it? What can it do?}
 the knowledge capture is the reusability of it to regenerate artifacts in
 different, but similarly applicable, languages. For example, the \acs{glassbr}
 case study had \porthref{software
-artifacts}{https://github.com/smiths/caseStudies/tree/master/CaseStudies/glass}
+artifacts}{https://github.com/smiths/caseStudies/tree/main/CaseStudies/glass}
 manually built. Once the knowledge was codified in Drasil, the same knowledge
 allows re-creation in \porthref{other
-languages}{https://github.com/JacquesCarette/Drasil/tree/master/code/stable/glassbr}.
+languages}{https://github.com/JacquesCarette/Drasil/tree/main/code/stable/glassbr}.
 
 \roughNetworkOfDomains{}
 

People/Jason/thesis/front/reading_notes.tex

@@ -23,7 +23,7 @@ \chapter{Reading Notes}
             and a guide for \porthref{building your own project with
                   Drasil}{https://github.com/JacquesCarette/Drasil/wiki/Creating-Your-Project-in-Drasil}.
             Similarly, the \porthref{source
-                  code}{https://github.com/JacquesCarette/Drasil/tree/master/People/Jason/thesis}
+                  code}{https://github.com/JacquesCarette/Drasil/tree/main/People/Jason/thesis}
             for this thesis is also publicly available.
 
       \item ``Source Code'' snippets with ``Original'' in their title show code

People/Jason/thesis/references.bib

@@ -372,7 +372,7 @@ @unpublished{well-understood
   note   = {Submitted Nov 2021 to NIER - New Ideas and Emerging Results (ICSE 2022)},
   title  = {When Capturing Knowledge Improves Productivity},
   year   = {2021},
-  url    = {https://github.com/JacquesCarette/Drasil/blob/master/Papers/WellUnderstood/wu.pdf}
+  url    = {https://github.com/JacquesCarette/Drasil/blob/main/Papers/WellUnderstood/wu.pdf}
 }
 
 @misc{wiki:Vasa_ship,

People/Sam/TestGen/Committee Meeting 1 - June 2023/presentation.tex

@@ -333,8 +333,8 @@ \subsubsection*{Example: Projectile}
     %     \end{column}
     % \end{columns}
 
-    % \only<2->{\footnotetext[1]{\tiny \url{https://github.com/JacquesCarette/Drasil/blob/master/notes/ProjectileMotionSketchOfSRS.pdf}}}
-    % \only<3->{\footnotetext[2]{\tiny \url{https://github.com/JacquesCarette/Drasil/blob/master/notes/FeedbackOnProjectile.tiff}}}
+    % \only<2->{\footnotetext[1]{\tiny \url{https://github.com/JacquesCarette/Drasil/blob/main/notes/ProjectileMotionSketchOfSRS.pdf}}}
+    % \only<3->{\footnotetext[2]{\tiny \url{https://github.com/JacquesCarette/Drasil/blob/main/notes/FeedbackOnProjectile.tiff}}}
     % \only<4->{\footnotetext[3]{\tiny \url{https://jacquescarette.github.io/Drasil/examples/projectile/SRS/srs/Projectile_SRS.html\#Sec:Intro}}}
     % \vspace{-3mm}
 \end{frame}

People/Sam/TestGen/Committee Meeting 1 - June 2023/references.bib

@@ -34,7 +34,7 @@ @misc{projectile_sketch
   license = {BSD-2-Clause},
   month   = {6},
   title   = {{Sketch} of {SRS} for {Projectile}},
-  url     = {https://github.com/JacquesCarette/Drasil/blob/master/notes/ProjectileMotionSketchOfSRS.pdf},
+  url     = {https://github.com/JacquesCarette/Drasil/blob/main/notes/ProjectileMotionSketchOfSRS.pdf},
   year    = {2019}
 }
 
@@ -43,7 +43,7 @@ @misc{projectile_wip
   license = {BSD-2-Clause},
   month   = {6},
   title   = {{Feedback} on {Projectile}},
-  url     = {https://github.com/JacquesCarette/Drasil/blob/master/notes/FeedbackOnProjectile.tiff},
+  url     = {https://github.com/JacquesCarette/Drasil/blob/main/notes/FeedbackOnProjectile.tiff},
   year    = {2019}
 }
 

README.md

@@ -35,7 +35,7 @@ Drasil is based on a combination of the following ideas:
 
 To better understand the requirements for Drasil, we follow an example-driven approach, based on a set of [case studies](https://github.com/smiths/caseStudies). This is akin to test-driven engineering, but at the system level.  The [currently generated examples](https://jacquescarette.github.io/Drasil/) serve as a good introduction to what we mean.
 
-We wrote a [position paper](https://github.com/JacquesCarette/Drasil/blob/master/People/Dan/ICSE%20Workshop%20-%20SE4Science/ICSE_LiterateFrameworkForSCSoftware_LSS.pdf) detailing our original ideas - but this is getting somewhat obsolete now. You can also take a look at [a poster](https://github.com/JacquesCarette/Drasil/blob/master/People/Dan/CAS%20Poster%20Competition/Poster/DrasilPoster.pdf). For more information on the details of Drasil, please see the [Drasil Wiki](https://github.com/JacquesCarette/Drasil/wiki). A collection of Drasil-related papers can be found [here](https://github.com/JacquesCarette/Drasil/wiki/Drasil-Papers-and-Documents). To contribute to this project, visit the [Contributor's Guide](https://github.com/JacquesCarette/Drasil/wiki/Contributor's-Guide).
+We wrote a [position paper](https://github.com/JacquesCarette/Drasil/blob/main/People/Dan/ICSE%20Workshop%20-%20SE4Science/ICSE_LiterateFrameworkForSCSoftware_LSS.pdf) detailing our original ideas - but this is getting somewhat obsolete now. You can also take a look at [a poster](https://github.com/JacquesCarette/Drasil/blob/main/People/Dan/CAS%20Poster%20Competition/Poster/DrasilPoster.pdf). For more information on the details of Drasil, please see the [Drasil Wiki](https://github.com/JacquesCarette/Drasil/wiki). A collection of Drasil-related papers can be found [here](https://github.com/JacquesCarette/Drasil/wiki/Drasil-Papers-and-Documents). To contribute to this project, visit the [Contributor's Guide](https://github.com/JacquesCarette/Drasil/wiki/Contributor's-Guide).
 
 ## Quick Start
 
@@ -108,7 +108,7 @@ generated Makefile (in the same folder as the tex file).
 
 You can run `make docs` from the **./code/** folder to build the documentation. **Note**: this process can take about 10-12 minutes (MacOS estimate).
 
-See the [README](https://github.com/JacquesCarette/Drasil/tree/master/code#building-up-to-date-documentation) in **./code/** for more information.
+See the [README](https://github.com/JacquesCarette/Drasil/tree/main/code#building-up-to-date-documentation) in **./code/** for more information.
 
 ## Citation
 

code/drasil-example/README.md

@@ -13,22 +13,22 @@ This folder contains our working examples (implementations in Drasil of the prev
 **gamephysics**
   - Contains the current state of the Game Physics case study implemented in Drasil
   - This is a re-creation of the original, manually-created version 
-    in the [gamephysics](https://github.com/smiths/caseStudies/tree/master/CaseStudies/gamephys) 2D Rigid Body Physics Library.
+    in the [gamephysics](https://github.com/smiths/caseStudies/tree/main/CaseStudies/gamephys) 2D Rigid Body Physics Library.
 
 **glassbr**
   - Contains the current state of the GlassBR case study implemented in Drasil
   - This is a re-creation of the original, manually-created version 
-    in the [Glass-BR](https://github.com/smiths/caseStudies/tree/master/CaseStudies/glass) example.
+    in the [Glass-BR](https://github.com/smiths/caseStudies/tree/main/CaseStudies/glass) example.
 
 **hghc**
   - Contains the current state of the HGHC (fuel pin) example implemented in Drasil
   - This is a re-creation of the original, manually-created version 
-    in the [hghc](https://github.com/smiths/caseStudies/tree/master/CaseStudies/hghc) toy example.
+    in the [hghc](https://github.com/smiths/caseStudies/tree/main/CaseStudies/hghc) toy example.
 
 **swhsnopcm**
   - Contains the current state of the solar water heating system case study implemented in Drasil
   - This is a re-creation of the original, manually-created version 
-    in the [Nopcm](https://github.com/smiths/caseStudies/tree/master/CaseStudies/noPCM) SWHS without PCM example.
+    in the [Nopcm](https://github.com/smiths/caseStudies/tree/main/CaseStudies/noPCM) SWHS without PCM example.
 
 **pdcontroller**
   - Contains the current state of the PD Controller example implemented in Drasil
@@ -38,15 +38,15 @@ This folder contains our working examples (implementations in Drasil of the prev
 **projectile**
   - Contains the current work on implementing the projectile example in Drasil
   - This is a re-creation of the original, manually-created version 
-    in the [Projectile](https://github.com/smiths/caseStudies/tree/master/CaseStudies/projectile/projectileSRS) motion analysis example.  
+    in the [Projectile](https://github.com/smiths/caseStudies/tree/main/CaseStudies/projectile/projectileSRS) motion analysis example.  
 
 **sglpend**
   - Contains the current state of the Single Pendulum case study implemented in Drasil
 
 **ssp**
   - Contains the current state of the slope stability analysis case study implemented in Drasil
   - This is a re-creation of the original, manually-created version 
-    in the [SSP](https://github.com/smiths/caseStudies/tree/master/CaseStudies/ssp) Slope Stability Analysis example. 
+    in the [SSP](https://github.com/smiths/caseStudies/tree/main/CaseStudies/ssp) Slope Stability Analysis example. 
 
 **swhs**
   - Contains the current state of the solar water heating system incorporating phase change material case study implemented in Drasil

code/drasil-website/app/Main.hs

@@ -29,7 +29,7 @@ main = do
   -- Because we want to be able to test site building locally, we fill in these stubs with
   -- (sometimes correct) assumptions.
   repoSlug <- fromMaybe "JacquesCarette/Drasil" <$> lookupEnv "GITHUB_REPOSITORY"
-  tree <- fromMaybe "master" <$> lookupEnv "DRASIL_WEBSITE_TREE"
+  tree <- fromMaybe "main" <$> lookupEnv "DRASIL_WEBSITE_TREE"
   -- Next two are metadata used to produce the footer.
   buildNumber <- fromMaybe "0" <$> lookupEnv "GITHUB_RUN_NUMBER"
   buildId <- lookupEnv "GITHUB_RUN_ID"

code/drasil-website/lib/Drasil/Website/Body.hs

@@ -157,7 +157,7 @@ chunksWiki = makeURI "chunksWiki" (gitHubInfoURL ++ "/wiki/Chunks") (shortname'
 recipesWiki :: Reference
 recipesWiki = makeURI "recipesWiki" (gitHubInfoURL ++ "/wiki/Recipes") (shortname' $ S "recipesWiki")
 paperGOOL :: Reference
-paperGOOL = makeURI "GOOLPaper" (gitHubInfoURL ++ "/blob/master/Papers/GOOL/GOOL.pdf") (shortname' $ S "GOOLPaper")
+paperGOOL = makeURI "GOOLPaper" (gitHubInfoURL ++ "/blob/main/Papers/GOOL/GOOL.pdf") (shortname' $ S "GOOLPaper")
 papersWiki :: Reference
 papersWiki = makeURI "papersWiki" (gitHubInfoURL ++ "/wiki/Drasil-Papers-and-Documents") (shortname' $ S "papersWiki")
 quickStartWiki :: Reference