Merge pull request #1950 from GSA/rename-branches-to-prod

Rename branches to prod
GSA · Jun 28, 2024 · e93533f · e93533f
2 parents 4ea33d6 + 0488b1b
commit e93533f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/_includes/challenges-loop-front-matter-data.html b/_includes/challenges-loop-front-matter-data.html
@@ -1,8 +1,8 @@
-{% if site.branch == "master" %}
+{% if site.branch == "production" %}
   <div id="challenge-gov-react-app" data-api-url="https://portal.challenge.gov" data-public-url="{{ site.baseurl }}"></div>
 {% elsif site.branch == "staging" %}
   <div id="challenge-gov-react-app" data-api-url="https://challenge-portal-staging.app.cloud.gov" data-public-url="{{ site.baseurl }}"></div>
-{% elsif site.branch == "embed-react-app" %}
+{% elsif site.branch == "dev" %}
   <div id="challenge-gov-react-app" data-api-url="https://challenge-portal-staging.app.cloud.gov" data-public-url="{{ site.baseurl }}"></div>
 {% elsif jekyll.environment == "dev" %}
   <div id="challenge-gov-react-app" data-api-url="http://localhost:4000" data-image-base="http://localhost:4000" data-public-url="http://localhost:4001" data-bridge-apply-blocked="false"></div>

diff --git a/_includes/footer.html b/_includes/footer.html
@@ -82,15 +82,15 @@
 </footer>
 <!-- Digital Analytics Program roll-up, see https://analytics.usa.gov for data -->
 <script id="_fed_an_ua_tag" src="https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js?agency={{site.dap_agency}}"></script>
-{% if site.branch == "master" %}
+{% if site.branch == "production" %}
 <link rel="stylesheet" href="https://portal.challenge.gov/css/public.css" crossorigin="anonymous">
 <script src="https://portal.challenge.gov/js/public.js"></script>
 <script src="https://portal.challenge.gov/js/client.js"></script>
 {% elsif site.branch == "staging" %}
 <link rel="stylesheet" href="https://challenge-portal-staging.app.cloud.gov/css/public.css" crossorigin="anonymous">
 <script src="https://challenge-portal-staging.app.cloud.gov/js/public.js"></script>
 <script src="https://challenge-portal-staging.app.cloud.gov/js/client.js"></script>
-{% elsif site.branch == "embed-react-app" %}
+{% elsif site.branch == "dev" %}
 <link rel="stylesheet" href="https://challenge-portal-staging.app.cloud.gov/css/public.css" crossorigin="anonymous">
 <script src="https://challenge-portal-staging.app.cloud.gov/js/public.js"></script>
 <script src="https://challenge-portal-staging.app.cloud.gov/js/client.js"></script>

diff --git a/_includes/header.html b/_includes/header.html
@@ -19,7 +19,7 @@
       <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
     <!-- Title and meta description
       ================================================== -->
-      <title>{% if page.challenge-title %}{{ page.challenge-title }} | {{ site.title }}{% elsif page.title %}{{ page.title }} | {{ site.title }}{% else %}{{ site.title }}{% endif %}</title> {% if site.branch != "master" %} 
+      <title>{% if page.challenge-title %}{{ page.challenge-title }} | {{ site.title }}{% elsif page.title %}{{ page.title }} | {{ site.title }}{% else %}{{ site.title }}{% endif %}</title> {% if site.branch != "production" %} 
       <meta name="robots" content="noindex, nofollow"> {% endif %}  
       <meta name="description" content="{{site.description}}">  
       <meta property="og:title" content="{% if page.challenge-title %}{{ page.challenge-title }}{% elsif page.title %}{{ page.title }} | {{ site.title }}{% else %}{{ site.title }}{% endif %}"> 

diff --git a/dependabot.yml b/dependabot.yml
@@ -2,6 +2,6 @@ version: 2
 updates:
   - package-ecosystem: "npm"
     directory: "/"
-    target-branch: "master"
+    target-branch: "production"
     schedule:
       interval: "weekly"