Skip to content

Commit

Permalink
Merge pull request #57 from eltana-org/combined-prs-branch
Browse files Browse the repository at this point in the history
Combined PRs
  • Loading branch information
GrantBirki committed May 2, 2023
2 parents 77d4e74 + 8193ab1 commit e5143e7
Show file tree
Hide file tree
Showing 4 changed files with 122 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/branch-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
# deploy the site to GitHub Pages
- name: deploy
id: deployment
uses: actions/deploy-pages@73e62e651178eeba977de2dc9f4c7645b3d01015 # pin@v2.0.0
uses: actions/deploy-pages@af48cf94a42f2c634308b1c9dc0151830b6f190a # pin@v2.0.1

# update the deployment result - manually complete the deployment that was created by the branch-deploy action
result:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@73e62e651178eeba977de2dc9f4c7645b3d01015 # pin@v2.0.0
uses: actions/deploy-pages@af48cf94a42f2c634308b1c9dc0151830b6f190a # pin@v2.0.1
129 changes: 118 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@fontsource/inter": "^4.5.15",
"@tailwindcss/typography": "^0.5.9",
"@typescript-eslint/eslint-plugin": "^5.59.0",
"@typescript-eslint/parser": "^5.59.0",
"@typescript-eslint/parser": "^5.59.2",
"astro": "^2.3.0",
"astro-compress": "^1.1.35",
"astro-icon": "^0.8.0",
Expand All @@ -48,7 +48,7 @@
"node": ">=19.7.0"
},
"dependencies": {
"@astrojs/react": "^2.1.1",
"@astrojs/react": "^2.1.2",
"@emotion/react": "^11.10.6",
"@emotion/styled": "^11.10.6",
"@mui/icons-material": "^5.11.11",
Expand Down

0 comments on commit e5143e7

Please sign in to comment.