From 2a43cb1dd948d97da9842fb5498262ca6e87d0fe Mon Sep 17 00:00:00 2001 From: Peter Smith Date: Sat, 20 Jan 2024 12:39:45 +0000 Subject: [PATCH 1/8] fix: removed some pages --- src/config.tsx | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/config.tsx b/src/config.tsx index 466daa8..49f590b 100644 --- a/src/config.tsx +++ b/src/config.tsx @@ -2,9 +2,6 @@ import { ReactComponent as GithubIcon } from './assets/github.svg'; import { ReactComponent as LinkedInIcon } from './assets/linkedin.svg'; import { ReactComponent as Logo } from './assets/logo.svg'; import Profile from './pages/profile.md' -import Experience from './pages/experience.md' -import Projects from './pages/projects.md' -import Sources from './pages/projects.md' import ReactMarkdown from 'react-markdown'; const markdown = (contents: string) => (<>); @@ -25,9 +22,6 @@ const config = { ], pages: [ () => markdown(Profile), - () => markdown(Experience), - () => markdown(Projects), - () => markdown(Sources), ] }; From 93ff38904d9260a169fb62c22e2b4a990c36c551 Mon Sep 17 00:00:00 2001 From: Peter Smith Date: Sat, 20 Jan 2024 13:28:35 +0000 Subject: [PATCH 2/8] feat: seperate deploy and build --- .github/workflows/build.yml | 26 ++++---------------------- .github/workflows/deploy.yml | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 22 deletions(-) create mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eef0140..46e9dc9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,13 +1,13 @@ -name: 🏗️ Build +name: build +run-name: 🚀 Build on: push: branches: - main - - release/** + pull_request: branches: - main - - release/** permissions: contents: write @@ -17,6 +17,7 @@ concurrency: jobs: build: + name: 🚀 Build runs-on: ubuntu-latest steps: - name: 🛎️ Checkout @@ -36,22 +37,3 @@ jobs: with: name: "build-artifact-${{ github.sha }}" path: build - - deploy: - needs: [build] - runs-on: ubuntu-latest - steps: - - name: 🛎️ Checkout - uses: actions/checkout@v3 - - - name: 📦 Download Build Artifact - uses: actions/download-artifact@v2 - with: - name: "build-artifact-${{ github.sha }}" - path: build - - - name: 🔺 Publish our Build Artifacts - uses: actions/upload-pages-artifact@v2 - with: - name: github-pages - path: build \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..b341e42 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,32 @@ +name: deploy +run-name: 🚀 Deploy +on: + workflow_run: + workflows: ["build"] + branches: ["main"] + types: + - completed + +permissions: + contents: write + +jobs: + deploy: + name: 🚀 Deploy + if: ${{ github.event.workflow_run.conclusion == 'success' }} + runs-on: ubuntu-latest + steps: + - name: 🛎️ Checkout + uses: actions/checkout@v3 + + - name: 📦 Download Build Artifact + uses: actions/download-artifact@v2 + with: + name: "build-artifact-${{ github.sha }}" + path: build + + - name: 🔺 Publish our Build Artifacts + uses: actions/upload-pages-artifact@v2 + with: + name: github-pages + path: build \ No newline at end of file From dc263acbaab93823e7a6371319d6a19512b58858 Mon Sep 17 00:00:00 2001 From: Peter Smith Date: Sat, 20 Jan 2024 13:30:51 +0000 Subject: [PATCH 3/8] feat: added release triggers --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 46e9dc9..9f77e13 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,10 +4,12 @@ on: push: branches: - main + - release/** pull_request: branches: - main + - release/** permissions: contents: write From dd5748de82f70f5fe16b794d3b63f29a1546e656 Mon Sep 17 00:00:00 2001 From: Peter Smith Date: Sat, 20 Jan 2024 13:36:30 +0000 Subject: [PATCH 4/8] feat: removed pages --- src/pages/experience.md | 31 ------------------------------- src/pages/projects.md | 32 -------------------------------- 2 files changed, 63 deletions(-) delete mode 100644 src/pages/experience.md delete mode 100644 src/pages/projects.md diff --git a/src/pages/experience.md b/src/pages/experience.md deleted file mode 100644 index 49d115a..0000000 --- a/src/pages/experience.md +++ /dev/null @@ -1,31 +0,0 @@ -# Experience - -TL;DR: - -- I'm a software engineer with 10+ years of experience in software development. -- [TypeScript](https://www.typescriptlang.org/) with [React](https://react.dev/) and/or [Node.js](https://nodejs.org/en) are my bread and butter. -- However, I'm keen to immerse myself in new technologies and broaden my horizons. - -## Huboo Technologies - -- Software Engineer -- December '20 - June '23 -- **TypeScript** | Vue | **Node.js** -- AWS | Docker | Serverless | Terraform | Kubernetes -- MySQL | MongoDB | Redis | ElasticSearch - -## Evergreen Computing - -- Software Engineer -- October '19 - December '20 -- **TypeScript** | Vue.js | PHP | Laravel -- Docker -- MySQL - -## Usay Compare - -- Software Engineer -- August '18 - October '19 -- **TypeScript** | **React** | GraphQL | Node.js -- GCP | Docker | Kubernetes | Terraform -- MySQL | MongoDB | Redis diff --git a/src/pages/projects.md b/src/pages/projects.md deleted file mode 100644 index 9fa5ef1..0000000 --- a/src/pages/projects.md +++ /dev/null @@ -1,32 +0,0 @@ -# Projects - -I have projects to keep me busy, and to keep me learning about a range of interest. I have a few projects that I am working on, and a few that I have worked on. I am always looking for new projects to work on, and I am always looking for new people to work with. [Hit Me Up](mailto:peter@smiths.im) for a collab. - -## La colectiva (aka DAO) - -- Core founder: facilitating proposals, agendas, discussions. -- Ownership: not only for pushing forward proposals, but also implementing any actions that are required. - -## Artist - -- Mediums: Painting, pastels, pencils, digital -- Styles: Abstract (predominantly) -- Quotes: "I do arts sometimes" - -## Gettin' my hands dirty - -- Mechanic - rebuilding a boat engine -- Qualified welder -- Gardener - -## Philanthropy - -### Hawkspring - -[Website](https://hawkspring.org.uk/) - -I have been overseeing/facilitating the integration of emerging technologies into this charity setting, to benefit their funding efforts (+ assisting their funding efforts). - -### Village Shop - -Working with a local village shop, that is fully community driven, to get the sense of community everyone needs. Working the till, wholesaler trips, egg requests, done a little bit of everything in my time. (not sharing establishment for anonymity reasons) From 186fe2541fc0c1ace4c8dcb709a9a5e67e32a0d7 Mon Sep 17 00:00:00 2001 From: Peter Smith Date: Sat, 20 Jan 2024 13:37:43 +0000 Subject: [PATCH 5/8] feat: added email --- src/config.tsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config.tsx b/src/config.tsx index 49f590b..b260b63 100644 --- a/src/config.tsx +++ b/src/config.tsx @@ -1,5 +1,6 @@ import { ReactComponent as GithubIcon } from './assets/github.svg'; import { ReactComponent as LinkedInIcon } from './assets/linkedin.svg'; +import { ReactComponent as EmailIcon } from './assets/email.svg'; import { ReactComponent as Logo } from './assets/logo.svg'; import Profile from './pages/profile.md' import ReactMarkdown from 'react-markdown'; @@ -19,6 +20,11 @@ const config = { url: 'https://www.linkedin.com/in/petertonysmith/', icon: LinkedInIcon }, + { + name: 'Email', + url: 'mailto:peter@smiths.im', + icon: EmailIcon + } ], pages: [ () => markdown(Profile), From 936ac3cde506809aed98d224cd31fb2e7d1a5f99 Mon Sep 17 00:00:00 2001 From: Peter Smith Date: Sat, 20 Jan 2024 13:37:58 +0000 Subject: [PATCH 6/8] feat: added email icon --- src/assets/email.svg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 src/assets/email.svg diff --git a/src/assets/email.svg b/src/assets/email.svg new file mode 100644 index 0000000..efb2091 --- /dev/null +++ b/src/assets/email.svg @@ -0,0 +1,5 @@ + + + \ No newline at end of file From 29f9cd3315cd3dbd2992f0aa87fea87646a0a1a7 Mon Sep 17 00:00:00 2001 From: Peter Smith Date: Sat, 20 Jan 2024 13:39:49 +0000 Subject: [PATCH 7/8] fix: use correct package for upload --- .github/workflows/build.yml | 2 +- src/pages/sources.md | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9f77e13..207f488 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: run: pnpm run build - name: 📦 Upload Build Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-pages-artifact@v3 with: name: "build-artifact-${{ github.sha }}" path: build diff --git a/src/pages/sources.md b/src/pages/sources.md index dafa034..d4f83fd 100644 --- a/src/pages/sources.md +++ b/src/pages/sources.md @@ -1,3 +1,7 @@ # Sources -[Shubham Dhage | 3D Artist](https://unsplash.com/@theshubhamdhage) \ No newline at end of file +[Shubham Dhage | 3D Artist](https://unsplash.com/@theshubhamdhage) + +- [./assets/shubham-dhage-pringle-layers.jpg](../assets/shubham-dhage-pringle-layers.jpg) +- [./assets/shubham-dhage-sphere-center.jpg](../assets/shubham-dhage-sphere-center.jpg) +- [./assets/shubham-dhage-sphere-offset-left.jpg](../assets/shubham-dhage-sphere-offset-left.jpg) \ No newline at end of file From 8249b83eccca11d27df9752821e44accb1f5f27c Mon Sep 17 00:00:00 2001 From: Peter Smith Date: Sat, 20 Jan 2024 13:48:47 +0000 Subject: [PATCH 8/8] fix: deployment file upgrade --- .github/workflows/deploy.yml | 43 ++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b341e42..b7e92d2 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -3,30 +3,39 @@ run-name: 🚀 Deploy on: workflow_run: workflows: ["build"] - branches: ["main"] + branches: ["main", "release/*"] types: - completed -permissions: - contents: write +env: + DEPLOY_PREVIEW: ${{ github.event.workflow_run.event == 'pull_request' }} + ARTIFACT_NAME: "build-artifact-${{ github.sha }}" + + jobs: deploy: - name: 🚀 Deploy + # Only run if the build was successful if: ${{ github.event.workflow_run.conclusion == 'success' }} + + name: 🚀 Deploy runs-on: ubuntu-latest - steps: - - name: 🛎️ Checkout - uses: actions/checkout@v3 + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} - - name: 📦 Download Build Artifact - uses: actions/download-artifact@v2 - with: - name: "build-artifact-${{ github.sha }}" - path: build - - - name: 🔺 Publish our Build Artifacts - uses: actions/upload-pages-artifact@v2 + permissions: + pages: write + contents: write + id-token: write + + steps: + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v4 with: - name: github-pages - path: build \ No newline at end of file + artifact_name: ${{ env.ARTIFACT_NAME}} + preview: ${{ env.DEPLOY_PREVIEW }} + + - name: Get the URL for the deployment + run: echo "${{ steps.deployment.outputs.page_url }}" \ No newline at end of file