Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,30 +51,3 @@ jobs:
if: github.ref == 'refs/heads/develop'
run: |
aws s3 sync --delete ./dist s3://${{ secrets.AWS_STAGING_BUCKET }}

- name: Deploy NREL
uses: JamesIves/github-pages-deploy-action@v4.6.4
if: github.ref == 'refs/heads/nrel'
with:
repository-name: BuildingEnergyTools/tools-website-nrel
branch: gh-pages
folder: dist
token: ${{ secrets.DEPLOY_STAGING_KEY }}

- name: Deploy LBNL
uses: JamesIves/github-pages-deploy-action@v4.6.4
if: github.ref == 'refs/heads/lbnl'
with:
repository-name: BuildingEnergyTools/tools-website-lbnl
branch: gh-pages
folder: dist
token: ${{ secrets.DEPLOY_STAGING_KEY }}

- name: Deploy PNNL
uses: JamesIves/github-pages-deploy-action@v4.6.4
if: github.ref == 'refs/heads/pnnl'
with:
repository-name: BuildingEnergyTools/tools-website-pnnl
branch: gh-pages
folder: dist
token: ${{ secrets.DEPLOY_STAGING_KEY }}
25 changes: 1 addition & 24 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
[![CI](https://github.com/BuildingEnergyTools/tools-website/actions/workflows/ci.yml/badge.svg)](https://github.com/BuildingEnergyTools/tools-website/actions/workflows/ci.yml)
[![Deploy](https://github.com/BuildingEnergyTools/tools-website/actions/workflows/deploy.yml/badge.svg)](https://github.com/BuildingEnergyTools/tools-website/actions/workflows/deploy.yml)

This project was generated with the Angular CLI. For more information on developing with Angular see the README
in the [doc folder](doc). The purpose of this README is to document the basic workflows of getting started.
This project was generated with the Angular CLI.

## Basic Workflow

Expand All @@ -13,24 +12,6 @@ The most basic workflow to edit content is to leverage GitHub's website to creat
- `main` - this is the branch that will be automatically deployed to the `gh-pages` and subsequently to https://buildingdata.energy.gov.
- `develop` - the most recent changes and from where all updates should branch. Will be deployed to https://buildingdata-stage.energy.gov.
- `gh-pages` - built and deployed website
- `pnnl` - branch to stage PNNL updates
- `lbnl` - branch to stage LBNL updates
- `nrel` - branch to stage NREL updates

** TODO: This needs to be updated, the deployment to these staging branches isn't working as expected. For now deploy to develop and the normal staging branch for testing **

The staging branches should be the jumping off point for each user in the respective labs; however, ensure that the staging branch is up-to-date with develop before starting. This is easily done by creating a new pull request in GitHub and having the base branch be the national lab. Click on the links below to be directed to this for you:

- [Update PNNL with Develop](https://github.com/BuildingEnergyTools/tools-website/compare/pnnl...develop)
- [Update LBNL with Develop](https://github.com/BuildingEnergyTools/tools-website/compare/lbnl...develop)
- [Update NREL with Develop](https://github.com/BuildingEnergyTools/tools-website/compare/nrel...develop)

There are 3 staging sites (one for each laboratory). The respective lab branches will automatically be built and deployed upon pushing
to this lab's branch to this repository (pnnl, lbnl, nrel). The sites are located here:

- [PNNL Staging Site](https://staging-pnnl.buildingenergytools.org)
- [LBNL Staging Site](https://staging-lbnl.buildingenergytools.org)
- [NREL Staging Site](https://staging-nrel.buildingenergytools.org)

## Advanced Workflow

Expand Down Expand Up @@ -61,7 +42,3 @@ To manually sync the website with the S3 bucket, configure permissions for using
ng build
aws s3 sync dist s3://nrel-btodatatools-web-prod-bucket
```

## Subdomain management

There are three subdomains on GitHub that are used to view the website before pushing to develop and main.
12 changes: 12 additions & 0 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,20 @@
<base href="/">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico">

<!-- Google Tag Manager -->
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
})(window,document,'script','dataLayer','GTM-WZQX9F4');</script>
<!-- End Google Tag Manager -->
</head>
<body class="mat-typography">
<!-- Google Tag Manager (noscript) -->
<noscript><iframe src=https://www.googletagmanager.com/ns.html?id=GTM-WZQX9F4
height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
<!-- End Google Tag Manager (noscript) -->
<app-root></app-root>
</body>
</html>