Compare commits

..

No commits in common. "master" and "deploy" have entirely different histories.

7 changed files with 77 additions and 64 deletions

View File

@ -1,21 +0,0 @@
name: Vercel Production Deployment
env:
VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
on:
push:
branches:
- main
jobs:
Deploy-Production:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install Vercel CLI
run: npm install --global vercel@latest
- name: Pull Vercel Environment Information
run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
- name: Build Project Artifacts
run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }}
- name: Deploy Project Artifacts to Vercel
run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }}

View File

@ -7,26 +7,27 @@ on:
jobs: jobs:
publish: publish:
timeout-minutes: 10 timeout-minutes: 10
runs-on: ubuntu-22.04 runs-on: debian-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v3
name: Checkout name: Checkout
- name: Build - name: Build
run: | run: |
pnpm --version && node --version npm --version && node --version
pnpm ci npm ci --no-update-notifier
pnpm run build npm run build
- name: Deploy to Netlify - uses: https://github.com/nwtgck/actions-netlify@v2.0
uses: nwtgck/actions-netlify@v3.0 name: Deploy
with: with:
publish-dir: './dist' publish-dir: './dist'
production-branch: master production-deploy: true
github-token: ${{ secrets.GITHUB_TOKEN }} github-token: ${{ secrets.GITHUB_TOKEN }}
deploy-message: "Deploy from GitHub Actions" deploy-message: "Deployed from Gitea Action"
enable-commit-comment: false
enable-pull-request-comment: false enable-pull-request-comment: false
enable-commit-comment: true
overwrites-pull-request-comment: true overwrites-pull-request-comment: true
enable-github-deployment: false
env: env:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }} NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
timeout-minutes: 1 timeout-minutes: 1

14
.github/workflows/gh-pages.yml vendored Normal file
View File

@ -0,0 +1,14 @@
name: Deploy to GitHub Pages
on:
push:
branches: main
workflow_dispatch:
jobs:
deploy:
uses: importantimport/.github/.github/workflows/pnpm-gh-pages.yml@main
permissions:
contents: write
with:
publish_dir: build

View File

@ -1,32 +0,0 @@
name: 'Publish to Netlify'
on:
push:
branches: [ prod, deploy ]
pull_request:
branches: [ prod, deploy ]
jobs:
publish:
timeout-minutes: 10
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
name: Checkout
- name: Build
run: |
pnpm --version && node --version
pnpm ci
pnpm run build
- name: Deploy to Netlify
uses: nwtgck/actions-netlify@v3.0
with:
publish-dir: './build'
production-branch: deploy
github-token: ${{ secrets.GH_TOKEN }}
deploy-message: "Deploy from Gitea Actions"
enable-pull-request-comment: false
enable-commit-comment: true
overwrites-pull-request-comment: true
env:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
timeout-minutes: 5

51
src/lib/config/index.ts Normal file
View File

@ -0,0 +1,51 @@
import { dev } from '$app/environment'
/* Website config */
const siteTitle = ''
const siteShortTitle = ''
const description =
'I code, I think, I write. My thoughts go into the world of Free & Open Source Software, AI and philosophy of mind, Climate Change, Cybersecurity.'
const siteUrl = dev ? 'http://localhost:5174' : 'https://mattmor.in'
const author = 'Matt Morin'
const backgroundColor = '#111827'
const themeColor = '#3b82f6'
const logo = '/Logo.png'
const keywords = 'Dev, FOSS, Nix, Philosopher, DevOps, Climate'
const ogLanguage = 'en_US'
const siteLanguage = 'en-US'
const defaultOgImage = ''
const defaultOgSquareImage = ''
const defaultTwitterImage = ''
// prettier-ignore
const website = { siteTitle, siteShortTitle, description, siteUrl, author, backgroundColor, themeColor, logo, keywords, ogLanguage, siteLanguage, defaultOgImage, defaultOgSquareImage, defaultTwitterImage };
/* Social Nicknames */
const GHNick = 'matthieu42morin'
const LINick = 'mattmor-in'
const MatrixServer = ''
const MatrixNick = ''
const MastodonServer = 'mastodon.social'
const MastodonNick = '@matt_mor'
const socialNicks = { GHNick, LINick, MatrixNick, MastodonNick }
/* Social links */
const Email = 'matt.b.morin@protonmail.com'
const Github = `https://github.com/${GHNick}`
const LinkedIn = `https://linkedin.com/in/${LINick}`
const Matrix = `https://${MatrixServer}/${MatrixNick}`
const Gitea = 'https://git.mattmor.in'
const Mastodon = `https://${MastodonServer}/${MastodonNick}`
const RSS = '/blog/feed'
const socialLinks = { Email, Github, LinkedIn, Matrix, Gitea, Mastodon, RSS }
// Routes
const NavRoutes = [
{ title: 'Home', href: '/' },
{ title: 'Blog', href: '/blog' },
{ title: 'Projects', href: '/projects' }
]
export { website, socialNicks, socialLinks, NavRoutes }