Skip to content
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

Fix Rsync #54

Merged
merged 18 commits into from
Sep 4, 2024
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
11 changes: 2 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,10 @@ jobs:
run: mkdir resources

- name: Download Resources from Server
run: rsync -rlgoDzvc -i ${{ secrets.REMOTE_USER }}@${{ secrets.REMOTE_HOST }}:/home/${{ secrets.REMOTE_USER }}/${{ secrets.HUGO_RESOURCES_URL }}/ resources/
run: rsync -aCvt --delete ${{ secrets.REMOTE_USER }}@${{ secrets.REMOTE_HOST }}:/home/${{ secrets.REMOTE_USER }}/${{ secrets.HUGO_RESOURCES_URL }}/ resources/

- name: Generate Resources
run: npm run build

- name: Push Resources to Server
uses: easingthemes/ssh-deploy@main
env:
SSH_PRIVATE_KEY: ${{ secrets.SERVER_SSH_KEY }}
ARGS: "-rlgoDzvc -i --delete"
SOURCE: "resources/"
REMOTE_HOST: ${{ secrets.REMOTE_HOST }}
REMOTE_USER: ${{ secrets.REMOTE_USER }}
TARGET: "/home/${{ secrets.REMOTE_USER }}/${{ secrets.HUGO_RESOURCES_URL }}/"
run: rsync -aCvt --delete resources/ ${{ secrets.REMOTE_USER }}@${{ secrets.REMOTE_HOST }}:/home/${{ secrets.REMOTE_USER }}/${{ secrets.HUGO_RESOURCES_URL }}/
11 changes: 2 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,5 @@ jobs:
- name: Delete Extra Folder
run: rm -rf public/404/

- name: Deploy Website to Server
uses: easingthemes/ssh-deploy@main
env:
SSH_PRIVATE_KEY: ${{ secrets.SERVER_SSH_KEY }}
ARGS: "-rgoDzv -i --delete"
SOURCE: "public/"
REMOTE_HOST: ${{ secrets.REMOTE_HOST }}
REMOTE_USER: ${{ secrets.REMOTE_USER }}
TARGET: "/home/${{ secrets.REMOTE_USER }}/${{ secrets.REMOTE_HOST }}/"
- name: Push Website to Server
run: rsync -aCvt --delete public/ ${{ secrets.REMOTE_USER }}@${{ secrets.REMOTE_HOST }}:/home/${{ secrets.REMOTE_USER }}/${{ secrets.REMOTE_HOST }}/
11 changes: 2 additions & 9 deletions .github/workflows/staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,5 @@ jobs:
- name: Build site
run: npm run build

- name: Deploy to Server
uses: easingthemes/ssh-deploy@main
env:
SSH_PRIVATE_KEY: ${{ secrets.SERVER_SSH_KEY }}
ARGS: "-rlgoDzvc -i"
SOURCE: "public/"
REMOTE_HOST: ${{ secrets.REMOTE_HOST }}
REMOTE_USER: ${{ secrets.REMOTE_USER }}
TARGET: "/home/${{ secrets.REMOTE_USER }}/${{ secrets.STAGING_SERVER }}/"
- name: Push Website to Staging Server
run: rsync -aCvt --delete public/ ${{ secrets.REMOTE_USER }}@${{ secrets.REMOTE_HOST }}:/home/${{ secrets.REMOTE_USER }}/${{ secrets.STAGING_SERVER }}/
23 changes: 16 additions & 7 deletions config/_default/menus.en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,44 +17,53 @@ main:
weight: 30
- parent: Resources
name: Library
url: /library/
pageRef: /library/
weight: 31
- parent: Resources
name: Filmography
url: /library/filmography/
pageRef: /library/filmography/
weight: 32
- parent: Resources
name: News Articles
url: /library/news/
pageRef: /library/news/
weight: 33
- parent: Resources
name: Advocacy
url: /library/advocacy/
pageRef: /library/advocacy/
weight: 34
- parent: Resources
name: Transcripts
url: /library/transcript/
pageRef: /library/transcript/
weight: 35

footer:
- name: Links
weight: 10
- name: Privacy Policy
parent: Links
pre: "fas fa-lock"
pageRef: /tos/privacy/
weight: 10
- name: Terms of Service
parent: Links
pre: "fas fa-file-contract"
pageRef: /tos/
weight: 20
- name: Copyright
parent: Links
pre: "fas fa-copyright"
pageRef: /tos/copyright/
weight: 30
- name: RSS Feed
- name: Contribute
parent: Links
pageRef: https://jorjafox.net/feed.xml
pre: "fab fa-github"
url: https://github.com/JorjaFox/website/
weight: 40
- name: RSS Feed
parent: Links
pre: "fas fa-rss"
url: https://jorjafox.net/feed.xml
weight: 50

social:
- name: Official Website
Expand Down
Loading