-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: make Directory header/footer match the marketing site #825
Merged
Merged
Changes from 21 commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
d066fc4
Rebuild header to match marketing site
SteelWagstaff 0d688db
Add about link to header
SteelWagstaff 1dd9dbe
Match marketing site footer
SteelWagstaff cfa434b
Remove external link tests
SteelWagstaff 0f12032
chore: lint & prettify
SteelWagstaff 17b5fdd
chore: update CI/CD pipeline
SteelWagstaff fd520e0
fix: use new cypress container
SteelWagstaff dcf0c7e
fix: node version
SteelWagstaff d274f15
chore: improve CI/CD pipeline
SteelWagstaff 101a83d
chore: improve CI/CD pipeline
SteelWagstaff 487c7e3
chore: update dependencies
SteelWagstaff 8308fab
chore: bump action
SteelWagstaff 0c81bdf
chore: fix CI pipeline
SteelWagstaff 09dba13
fix: separate CI pipeline into two phases
SteelWagstaff 33ea9de
fix: CI test pipeline
SteelWagstaff a7e07cf
fix: env block
SteelWagstaff f4d4c9a
fix: CI config
SteelWagstaff 70b1dff
fix: job titles
SteelWagstaff f9c3d2e
chore: pin search-insights to last working version
SteelWagstaff 7dea331
chore: pin search-insights to last working version & fix CI
SteelWagstaff ace1634
fix: broken test
SteelWagstaff d8bf280
chore: pin intro.js at 6.0.0
SteelWagstaff 569a294
fix: test wait for subject
arzola File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,17 @@ | ||
name: Tests | ||
name: Run e2e Tests | ||
|
||
on: | ||
push: | ||
branches: [ dev, master, v2 ] | ||
branches: [dev, production] | ||
tags: | ||
- '*.*.*' | ||
pull_request: | ||
branches: [ dev, v2 ] | ||
branches: [dev] | ||
|
||
jobs: | ||
testing: | ||
runs-on: ubuntu-latest | ||
container: cypress/browsers:node12.18.3-chrome87-ff82 | ||
name: Testing | ||
e2e-tests: | ||
runs-on: ubuntu-20.04 | ||
container: cypress/browsers:node16.16.0-chrome107-ff107 | ||
env: | ||
VITE_ALGOLIA_APP_ID: ${{ secrets.VITE_ALGOLIA_APP_ID }} | ||
VITE_ALGOLIA_API_READ_KEY: ${{ secrets.VITE_ALGOLIA_API_READ_KEY }} | ||
|
@@ -20,51 +21,32 @@ jobs: | |
VITE_USER_NODE_ENV: ${{ secrets.VITE_USER_NODE_ENV }} | ||
steps: | ||
- name: Checkout code | ||
uses: actions/checkout@v2 | ||
with: | ||
fetch-depth: 2 | ||
|
||
- uses: actions/setup-node@v2 | ||
with: | ||
node-version: '16' | ||
uses: actions/checkout@v3 | ||
|
||
- name: Debug Env | ||
run: | | ||
echo ${{ secrets.VITE_ALGOLIA_APP_ID }} | ||
echo ${{ secrets.VITE_ALGOLIA_API_READ_KEY }} | ||
echo ${{ secrets.VITE_ALGOLIA_INDEX }} | ||
|
||
- name: Install dependencies | ||
run: | | ||
node -v | ||
npm i | ||
|
||
- name: Lint | ||
run: npm run lint | ||
|
||
- uses: marceloprado/has-changed-path@v1 | ||
id: code-changes | ||
with: | ||
paths: src e2e | ||
- name: Run e2e tests | ||
uses: cypress-io/[email protected] | ||
|
||
- name: e2e Tests | ||
if: steps.code-changes.outputs.changed == 'true' | ||
uses: cypress-io/github-action@v4 | ||
with: | ||
start: npm run dev | ||
wait-on: http://localhost:3001 | ||
browser: chrome | ||
|
||
- name: Deploy to AWS Testing | ||
uses: zulhfreelancer/[email protected] | ||
if: github.ref == 'refs/heads/v2' | ||
with: | ||
aws-region: "ca-central-1" | ||
aws-access-key: ${{ secrets.AWS_PIPELINE_ACCESS_KEY }} | ||
aws-secret-key: ${{ secrets.AWS_PIPELINE_SECRET_KEY }} | ||
pipeline-name: "v2_pressbooks_directory" | ||
# - name: Deploy to AWS Testing | ||
# uses: zulhfreelancer/[email protected] | ||
# if: github.ref == 'refs/heads/v2' | ||
# with: | ||
# aws-region: "ca-central-1" | ||
# aws-access-key: ${{ secrets.AWS_PIPELINE_ACCESS_KEY }} | ||
# aws-secret-key: ${{ secrets.AWS_PIPELINE_SECRET_KEY }} | ||
# pipeline-name: "v2_pressbooks_directory" | ||
|
||
- name: Deploy to AWS Dev / Staging | ||
- name: Deploy to AWS Dev | ||
uses: zulhfreelancer/[email protected] | ||
if: github.ref == 'refs/heads/dev' | ||
with: | ||
|
@@ -75,10 +57,9 @@ jobs: | |
|
||
- name: Deploy to AWS Production | ||
uses: zulhfreelancer/[email protected] | ||
if: github.ref == 'refs/heads/master' | ||
if: github.ref == 'refs/heads/production' | ||
with: | ||
aws-region: "ca-central-1" | ||
aws-access-key: ${{ secrets.AWS_PIPELINE_PROD_ACCESS_KEY }} | ||
aws-secret-key: ${{ secrets.AWS_PIPELINE_PROD_SECRET_KEY }} | ||
pipeline-name: "pressbooks-directory" | ||
|
||
pipeline-name: "pressbooks-directory" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
name: Lint & build assets | ||
|
||
on: | ||
push: | ||
branches: [ dev, production ] | ||
pull_request: | ||
branches: [ dev, production ] | ||
|
||
jobs: | ||
lint-and-build: | ||
runs-on: ubuntu-20.04 | ||
strategy: | ||
matrix: | ||
node: [ '16', '18' ] | ||
name: Node ${{ matrix.node }} | ||
|
||
steps: | ||
- uses: actions/checkout@v3 | ||
|
||
- name: Setup node | ||
uses: actions/setup-node@v3 | ||
with: | ||
node-version: ${{ matrix.node }} | ||
|
||
- name: Cache node modules | ||
uses: actions/cache@v3 | ||
with: | ||
path: node_modules | ||
key: ${{ runner.OS }}-build-${{ hashFiles('**/package-lock.json') }} | ||
|
||
- name: Install dependencies | ||
run: | | ||
node -v | ||
npm ci | ||
|
||
- name: Lint | ||
run: npm run lint | ||
|
||
- name: Build assets | ||
run: npm run build --if-present |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixes test behaviour