Skip to content
This repository has been archived by the owner on Jun 10, 2024. It is now read-only.

Commit

Permalink
Fixing new version conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
mitchas committed Nov 4, 2022
2 parents 990c8de + abe3f1b commit 9339c51
Show file tree
Hide file tree
Showing 271 changed files with 13,487 additions and 44,584 deletions.
11 changes: 11 additions & 0 deletions .eleventy.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
module.exports = function (config) {
config.addPassthroughCopy({ 'src/assets/scripts': 'js' });
config.addPassthroughCopy({ 'src/assets/images': 'img' });

return {
dir: {
input: 'src',
output: 'dist',
},
};
};
40 changes: 20 additions & 20 deletions .github/graph-ql.query.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
query:
'query {organization(login:"USGS-WiM") {
id
name
repositories(first:100) {
nodes {
id
name
createdAt
description
homepageUrl
object(expression: "master:code.json") {
... on Blob {
text
}
}
}
}
}
}'
# query:
# 'query {organization(login:"USGS-WiM") {
# id
# name
# repositories(first:100) {
# nodes {
# id
# name
# createdAt
# description
# homepageUrl
# object(expression: "master:code.json") {
# ... on Blob {
# text
# }
# }
# }
# }
# }
# }'
40 changes: 20 additions & 20 deletions .github/graph-ql.query2.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
query:
'query {organization(login:"USGS-WiM") {
id
name
repositories(last:100) {
nodes {
id
name
createdAt
description
homepageUrl
object(expression: "master:code.json") {
... on Blob {
text
}
}
}
}
}
}'
# query:
# 'query {organization(login:"USGS-WiM") {
# id
# name
# repositories(last:100) {
# nodes {
# id
# name
# createdAt
# description
# homepageUrl
# object(expression: "master:code.json") {
# ... on Blob {
# text
# }
# }
# }
# }
# }
# }'
72 changes: 36 additions & 36 deletions .github/workflows/push-push-to-prod-site.yml
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
on:
push:
branches:
- master
name: "Production"
jobs:
pushToProd:
name: Push to PRODUCTION
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Set Up Node
uses: actions/setup-node@v1
with:
node-version: '10.15'
- run: npm run-script build
# on:
# push:
# branches:
# - master
# name: "Production"
# jobs:
# pushToProd:
# name: Push to PRODUCTION
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@master
# - name: Set Up Node
# uses: actions/setup-node@v1
# with:
# node-version: '10.15'
# - run: npm run-script build

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-east-2
- run: aws s3 cp /home/runner/work/WIM-Main-Site/WIM-Main-Site/builds/production/ s3://wim.usgs.gov/ --recursive
# - name: Configure AWS Credentials
# uses: aws-actions/configure-aws-credentials@v1
# with:
# aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
# aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
# aws-region: us-east-2
# - run: aws s3 cp /home/runner/work/WIM-Main-Site/WIM-Main-Site/builds/production/ s3://wim.usgs.gov/ --recursive

- name: AWS Prod Failure
if: failure()
uses: Ilshidur/action-slack@2a8ddb6db23f71a413f9958ae75bbc32bbaa6385
env:
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
with:
args: ":warning::production: Error deploying *wim-main-site* to wim.usgs.gov - GitHub Action Failed"
# - name: AWS Prod Failure
# if: failure()
# uses: Ilshidur/action-slack@2a8ddb6db23f71a413f9958ae75bbc32bbaa6385
# env:
# SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
# with:
# args: ":warning::production: Error deploying *wim-main-site* to wim.usgs.gov - GitHub Action Failed"


- name: GitHub Action for Slack
uses: Ilshidur/action-slack@2a8ddb6db23f71a413f9958ae75bbc32bbaa6385
env:
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
with:
args: ":production: Successfully deployed *wim-main-site* to wim.usgs.gov :fire:"
# - name: GitHub Action for Slack
# uses: Ilshidur/action-slack@2a8ddb6db23f71a413f9958ae75bbc32bbaa6385
# env:
# SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
# with:
# args: ":production: Successfully deployed *wim-main-site* to wim.usgs.gov :fire:"



Expand Down
72 changes: 36 additions & 36 deletions .github/workflows/push-push-to-test-site.yml
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
on:
push:
branches:
- staging
name: "Testing"
jobs:
pushToTest:
name: Push to TEST
runs-on: ubuntu-latest
# on:
# push:
# branches:
# - staging
# name: "Testing"
# jobs:
# pushToTest:
# name: Push to TEST
# runs-on: ubuntu-latest

steps:
- uses: actions/checkout@master
- name: Set Up Node
uses: actions/setup-node@v1
with:
node-version: '10.15'
- run: npm run-script build
# steps:
# - uses: actions/checkout@master
# - name: Set Up Node
# uses: actions/setup-node@v1
# with:
# node-version: '10.15'
# - run: npm run-script build

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-east-2
- run: aws s3 cp /home/runner/work/WIM-Main-Site/WIM-Main-Site/builds/production/ s3://test.wim.usgs.gov/ --recursive
# - name: Configure AWS Credentials
# uses: aws-actions/configure-aws-credentials@v1
# with:
# aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
# aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
# aws-region: us-east-2
# - run: aws s3 cp /home/runner/work/WIM-Main-Site/WIM-Main-Site/builds/production/ s3://test.wim.usgs.gov/ --recursive

- name: AWS Test Failure
if: failure()
uses: Ilshidur/action-slack@2a8ddb6db23f71a413f9958ae75bbc32bbaa6385
env:
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
with:
args: ":warning::test: Error deploying *wim-main-site* to test.wim.usgs.gov - GitHub Action Failed"
# - name: AWS Test Failure
# if: failure()
# uses: Ilshidur/action-slack@2a8ddb6db23f71a413f9958ae75bbc32bbaa6385
# env:
# SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
# with:
# args: ":warning::test: Error deploying *wim-main-site* to test.wim.usgs.gov - GitHub Action Failed"

- name: GitHub Action for Slack
uses: Ilshidur/action-slack@2a8ddb6db23f71a413f9958ae75bbc32bbaa6385
env:
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
with:
args: ":test: Successfully deployed *wim-main-site* to test.wim.usgs.gov :fire:"
# - name: GitHub Action for Slack
# uses: Ilshidur/action-slack@2a8ddb6db23f71a413f9958ae75bbc32bbaa6385
# env:
# SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
# with:
# args: ":test: Successfully deployed *wim-main-site* to test.wim.usgs.gov :fire:"

72 changes: 36 additions & 36 deletions .github/workflows/schedule-production-repo-workflow.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
on:
schedule:
- cron: '05 17 * * *'
name: Production Repo Workflow
jobs:
graphQLQuery2:
name: GraphQL query2
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: GraphQL query2
uses: helaili/github-graphql-action@fb0ce78d56777b082e1a1659faf2b9f5a8832ed3
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
args: --query .github/graph-ql.query2.yaml --output repos2.json
- name: GraphQL query
uses: helaili/github-graphql-action@fb0ce78d56777b082e1a1659faf2b9f5a8832ed3
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
args: --query .github/graph-ql.query.yaml --output repos1.json
# on:
# schedule:
# - cron: '05 17 * * *'
# name: Production Repo Workflow
# jobs:
# graphQLQuery2:
# name: GraphQL query2
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@master
# - name: GraphQL query2
# uses: helaili/github-graphql-action@fb0ce78d56777b082e1a1659faf2b9f5a8832ed3
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# with:
# args: --query .github/graph-ql.query2.yaml --output repos2.json
# - name: GraphQL query
# uses: helaili/github-graphql-action@fb0ce78d56777b082e1a1659faf2b9f5a8832ed3
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# with:
# args: --query .github/graph-ql.query.yaml --output repos1.json

- name: Repos To AWS - Prod 1
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-east-2
- run: aws s3 cp /home/runner/work/WIM-Main-Site/WIM-Main-Site/repos1.json s3://wim.usgs.gov/src/repos1.json
# - name: Repos To AWS - Prod 1
# uses: aws-actions/configure-aws-credentials@v1
# with:
# aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
# aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
# aws-region: us-east-2
# - run: aws s3 cp /home/runner/work/WIM-Main-Site/WIM-Main-Site/repos1.json s3://wim.usgs.gov/src/repos1.json

- name: Repos To AWS - Prod 2
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-east-2
- run: aws s3 cp /home/runner/work/WIM-Main-Site/WIM-Main-Site/repos2.json s3://wim.usgs.gov/src/repos2.json
# - name: Repos To AWS - Prod 2
# uses: aws-actions/configure-aws-credentials@v1
# with:
# aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
# aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
# aws-region: us-east-2
# - run: aws s3 cp /home/runner/work/WIM-Main-Site/WIM-Main-Site/repos2.json s3://wim.usgs.gov/src/repos2.json


Loading

0 comments on commit 9339c51

Please sign in to comment.