Skip to content

Commit 68bfe2e

Browse files
joeshoopjoeshoop
committed
merge main into UI
an attempt, at least
2 parents 9ea5132 + 3582936 commit 68bfe2e

157 files changed

Lines changed: 3099 additions & 329 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build-dev.yml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Dev
33
on:
44
push:
55
paths:
6-
- 'web/**'
6+
- "web/**"
77
workflow_dispatch:
88

99
jobs:
@@ -12,34 +12,34 @@ jobs:
1212
if: ${{ github.ref == 'refs/heads/11ty-v3' }}
1313
runs-on: ubuntu-latest
1414
steps:
15-
- name: Checkout Code
16-
uses: actions/checkout@v4
17-
18-
- name: Install Node.js
19-
uses: actions/setup-node@v4
20-
with:
21-
node-version: '23'
22-
23-
- name: Install Project Dependencies
24-
run: npm ci --legacy-peer-deps
25-
working-directory: web
26-
27-
- name: Build 11ty
28-
run: npx @11ty/eleventy
29-
working-directory: web
30-
31-
- name: Verify build
32-
run: ls -la _site
33-
working-directory: web
34-
35-
- name: Set Up SSH
36-
run: |
37-
mkdir -p ~/.ssh/
38-
echo "${{ secrets.DO_UXM_DEV_SSH_KEY }}" > ~/.ssh/do_uxm_dev
39-
sudo chmod 600 ~/.ssh/do_uxm_dev
40-
ssh-keyscan -H "24.199.98.130" > ~/.ssh/known_hosts
41-
42-
- name: Clean & SFTP Upload
43-
run: |
44-
ssh -i ~/.ssh/do_uxm_dev dev@24.199.98.130 "rm -rf /var/www/dev/html/*"
45-
sftp -i ~/.ssh/do_uxm_dev dev@24.199.98.130 <<< $'cd /var/www/dev/html \n put -r web/_site/*'
15+
- name: Checkout Code
16+
uses: actions/checkout@v4
17+
18+
- name: Install Node.js
19+
uses: actions/setup-node@v4
20+
with:
21+
node-version: "23"
22+
23+
- name: Install Project Dependencies
24+
run: npm ci --legacy-peer-deps
25+
working-directory: web
26+
27+
- name: Build 11ty
28+
run: npx @11ty/eleventy
29+
working-directory: web
30+
31+
- name: Verify build
32+
run: ls -la _site
33+
working-directory: web
34+
35+
- name: Set Up SSH
36+
run: |
37+
mkdir -p ~/.ssh/
38+
echo "${{ secrets.DO_UXM_DEV_SSH_KEY }}" > ~/.ssh/do_uxm_dev
39+
sudo chmod 600 ~/.ssh/do_uxm_dev
40+
ssh-keyscan -H "24.199.98.130" > ~/.ssh/known_hosts
41+
42+
- name: Clean & SFTP Upload
43+
run: |
44+
ssh -i ~/.ssh/do_uxm_dev dev@24.199.98.130 "rm -rf /var/www/dev/html/*"
45+
sftp -i ~/.ssh/do_uxm_dev dev@24.199.98.130 <<< $'cd /var/www/dev/html \n put -r web/_site/*'

‎.github/workflows/build-prod.yml‎

Lines changed: 48 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,67 +2,72 @@ name: Production
22

33
on:
44
workflow_dispatch:
5-
# repository_dispatch:
6-
# types:
7-
# - method
8-
# - discipline
9-
# - resource
10-
# - article
11-
# push:
12-
# paths:
13-
# - 'web/**'
5+
repository_dispatch:
6+
types:
7+
- method
8+
- discipline
9+
- resource
10+
- article
11+
push:
12+
paths:
13+
- "web/**"
1414

1515
jobs:
1616
load-rdf-job:
1717
runs-on: ubuntu-latest
18-
name: Transform and load Sanity content as RDF then build and upload UX Methods
19-
if: ${{ github.ref == 'refs/heads/main' }}
18+
name: Build and deploy 11ty site to Digital Ocean
19+
# name: Transform and load Sanity content as RDF then build and upload UX Methods
20+
if: ${{ github.ref == 'refs/heads/main' }}
2021
steps:
2122
- name: Checkout Branch
22-
uses: actions/checkout@v2
23-
- name: Extract & Transform
24-
uses: ./actions/method-transform
25-
id: extract-transform
26-
- name: Upload RDF file as artifact
27-
uses: actions/upload-artifact@v2
28-
with:
29-
name: rdfData
30-
path: rdfData.ttl
31-
# Artifact is needed for this upload step. Look into more efficient way to pass this — input/output
32-
- name: Upload RDF to Data.World
33-
uses: fjogeleit/http-request-action@master
34-
with:
35-
url: 'https://api.data.world/v0/uploads/andyfitzgerald/method-io-data/files'
36-
method: 'POST'
37-
contentType: 'multipart/form-data'
38-
bearerToken : ${{ secrets.DATA_WORLD_READ_WRITE }}
39-
files: '{ "file": "rdfData.ttl" }'
23+
uses: actions/checkout@v4
24+
25+
# Data extractin and transformation. Reintegrate later.
26+
# - name: Extract & Transform
27+
# uses: ./actions/method-transform
28+
# id: extract-transform
29+
30+
# - name: Upload RDF file as artifact
31+
# uses: actions/upload-artifact@v2
32+
# with:
33+
# name: rdfData
34+
# path: rdfData.ttl
35+
# # Artifact is needed for this upload step. Look into more efficient way to pass this — input/output
36+
37+
# - name: Upload RDF to Data.World
38+
# uses: fjogeleit/http-request-action@master
39+
# with:
40+
# url: "https://api.data.world/v0/uploads/andyfitzgerald/method-io-data/files"
41+
# method: "POST"
42+
# contentType: "multipart/form-data"
43+
# bearerToken: {{ secrets.DATA_WORLD_READ_WRITE }}
44+
# files: '{ "file": "rdfData.ttl" }'
45+
4046
- name: Install Node.js
4147
uses: actions/setup-node@v1
4248
with:
43-
node-version: '17.x'
49+
node-version: "23"
50+
4451
- name: Install Project Dependencies
45-
run: npm ci
52+
run: npm ci --legacy-peer-deps
4653
working-directory: web
4754

48-
- name: Install Gatsby CLI
49-
run: npm install -g gatsby-cli@4.3.0
55+
- name: Build 11ty
56+
run: npx @11ty/eleventy
5057
working-directory: web
5158

52-
- name: Build
53-
run: gatsby build
54-
working-directory: web
55-
5659
- name: Verify build
57-
run: ls -la public
60+
run: ls -la ./_site
5861
working-directory: web
5962

6063
- name: Set Up SSH
6164
run: |
6265
mkdir -p ~/.ssh/
63-
echo "${{ secrets.UXM_PROD_DREAMHOST_SSH_KEY }}" > ~/.ssh/uxm_prod
64-
sudo chmod 600 ~/.ssh/uxm_prod
65-
ssh-keyscan -H "jacksonville.dreamhost.com" > ~/.ssh/known_hosts
66+
echo "${{ secrets.DO_UXM_PROD_SSH_KEY }}" > ~/.ssh/do_uxm_prod
67+
sudo chmod 600 ~/.ssh/do_uxm_prod
68+
ssh-keyscan -H "24.199.98.130" > ~/.ssh/known_hosts
6669
67-
- name: SFTP Upload
68-
run: sftp -i ~/.ssh/uxm_prod uxm_prod@jacksonville.dreamhost.com <<< $'cd uxmethods.org \n put -r web/public/*'
70+
- name: Clean & FTP Upload
71+
run: |
72+
ssh -i ~/.ssh/do_uxm_prod prod@24.199.98.130 "rm -rf /var/www/uxm/html/*"
73+
sftp -i ~/.ssh/do_uxm_prod prod@24.199.98.130 <<< $'cd /var/www/uxm/html \n put -r web/_site/*'

MIGRATION_NOTES.MD renamed to 2021/MIGRATION_NOTES.MD

_studio_v2/.gitignore renamed to 2021/_studio_v2/.gitignore

File renamed without changes.

_studio_v2/README.md renamed to 2021/_studio_v2/README.md

_studio_v2/components/LDHyperlink.js renamed to 2021/_studio_v2/components/LDHyperlink.js

File renamed without changes.

_studio_v2/components/MetaDescription.js renamed to 2021/_studio_v2/components/MetaDescription.js

File renamed without changes.

_studio_v2/config/.checksums renamed to 2021/_studio_v2/config/.checksums

File renamed without changes.

_studio_v2/config/@sanity/data-aspects.json renamed to 2021/_studio_v2/config/@sanity/data-aspects.json

File renamed without changes.

_studio_v2/config/@sanity/default-layout.json renamed to 2021/_studio_v2/config/@sanity/default-layout.json

File renamed without changes.

0 commit comments

Comments
 (0)